Merge lp:~csurbhi/ubuntu/natty/mountall/mountall-stop-timer into lp:ubuntu/natty/mountall

[Surbhi Palande]

mountall provides support to wait for some time for devices to get ready when indicated through fstab with a "timeout" option. In some cases where human interaction is needed for configuring the device, the time that mountall waits may not indicate the time that the system takes in configuring the device. While the human interaction is happening, we may want to stop the timer and then restart it when the human interaction is through.

This patch adds support to start a private mountall server and exposes interfaces to stop and restart a timer if the device mentioned is indeed tagged with a TAG_TIMEOUT. Its upto the client program to appropriately send the device name which matches with what is indicated in /etc/fstab (otherwise the timer will have no effect).

The timer is not restarted with the remaining time, but what was indicated when mountall was started. This is intentionally done because of the fact that the human interaction would anyway change the timeout really and so no client application can really wait on the exact timeout.

Also, right now there is no consideration on authentication between the client and mountall (as the system bus is not involved) However this might need to be done, especially for the case when we are not in the initramfs context.

[Surbhi Palande (csurbhi)]

I guess, this should be a merge request for Ubuntu Oneiric now. Please do consider this for the same. Thanks!

[lp:~csurbhi/ubuntu/natty/mountall/mountall-stop-timer]

358. By Surbhi Palande on 2011-04-13

Fixed two errors found while browsing the code: 1) find_mount("/") returns
NULL when / is not found, so cannot access root->mounted. 2) the
information message about the dev_wait_timeout should be printed after
dev_wait_timeout is initialized properly.

359. By Bryce Harrington on 2011-06-07

Correct grammar on user-visible strings
(LP: #572016)

[Colin Watson (cjwatson)]

+ <allow send_destination="com.ubuntu.Mountall.Server"
+ send_interface="com.ubuntu.Mountall0_1.Server"
+ send_type="method_call" send_member="StopTimer" />
+ <allow send_destination="com.ubuntu.Mountall.Server"
+ send_interface="com.ubuntu.Mountall0_1.Server"
+ send_type="method_call" send_member="RestartTimers" />
+
+ <allow send_destination="com.ubuntu.Mountall.Server"
+ send_interface="com.ubuntu.Mountall0_1.Server.Job"
+ send_type="method_call" send_member="ChangeMountDevice" />

These methods should be root-only; just removing them from <policy context="default"> should be good enough.

+ <allow send_destination="com.ubuntu.Mountall.Server"
+ send_interface="com.ubuntu.Mountall0_1.Server.Job"

Remove ".Job".

+ <method name="RestartTimer">
+ <arg name="devname" type="s" direction="in" />
+ </method>

This is called RestartTimers in the .conf file. Which is correct?

Also, the .conf file has an entry for GetMountDevices, but that is missing from the .xml file.

- --package=$(PACAKGE) \
+ --package=$(PACKAGE) \

Thanks for fixing this, but there's another (probably copied-and-pasted) occurrence of $(PACAKGE) below. Could you fix that too?

=== added file 'src/control.c'
--- src/control.c 1970-01-01 00:00:00 +0000
+++ src/control.c 2011-06-30 18:09:32 +0000
@@ -0,0 +1,253 @@
+/* mountall
+ *
+ * Copyright © 2010 Canonical Ltd.
+ * Author: Surbhi A. Palande <email address hidden>

This is substantially copied from Upstart. That's fine - they're both copyright Canonical with the same licence, but it'd be good form to acknowledge Scott's co-authorship.

Otherwise I'm happy with this on visual inspection.

review: Needs Fixing

[lp:~csurbhi/ubuntu/natty/mountall/mountall-stop-timer]

360. By Surbhi Palande on 2011-07-01

Added com.ubuntu.Mountall.server interface. Implemented the mntctl command
with 4 commands: 1. StopTimer 2. RestartTimer 3. ChangeMountDevice 4.
Version.

[Surbhi Palande (csurbhi)]

Hi Colin,

Thanks a lot for the review. I have made the suggested changes and also added one more change:
a) for installing the dbus/Mountall.Server to the correct dir: /etc/dbus-1/system.d
in the dbus/Makefile.am

Please do let me know if this looks alright to you.

Warm Regards,
Surbhi.

[Surbhi Palande (csurbhi)]

Hi Colin,

And I forgot to mention that I have also remove the upstart job responsible for stopping and restarting the timer before and after cryptsetup job respectively for now. I will add that soon here!

Warm Regards,
Surbhi.

[lp:~csurbhi/ubuntu/natty/mountall/mountall-stop-timer]

361. By Surbhi Palande on 2011-07-08

Fixed the coding style bugs in the "timeout" option related code. Also
removed a break from the is_device_ready () to get the "device-not-ready"
event for all the devices which are marked with the timeout option and
which are not ready by the time the timer expires.

362. By Surbhi Palande on 2011-07-08

Added debian/initramfs/Makefile.am to install mountall.initramfs-hook as
an initramfs hook that installs mntctl, mountall and other files needed by
an event driven initramfs. Also added
debian/initramfs/upstart-jobs/Makefile.am to install the upstart-jobs
related to mountall in the event driven initramfs. The current
mountall.conf execute as an upstart job in place of the "local" script in
the non-event driven initramfs

363. By Surbhi Palande on 2011-07-08

Changed the tag from maverick to oneiric

364. By Surbhi Palande on 2011-07-11

Added the missing debian/initramfs/upstart-jobs/Makefile.am for installing the
upstart jobs related to the functioning of the event driven initramfs

365. By Surbhi Palande on 2011-07-11

Fixed the installation of upstart jobs to event-driven dir in the
/usr/share/initramfs-tools/event-driven/

366. By Surbhi Palande on 2011-07-11

Changed the default mountall hook name to mountall.

367. By Surbhi Palande on 2011-07-15

Changed the DATA hook to SCRIPT hook to preserve the +x flag on the mountall
hook for initramfs.

368. By Surbhi Palande on 2011-07-15

Removed the previously added term_handler for the following reasons:
1) You need to disconnect from the dbus_server and unref it only once.
This must happen when mountall finishes mounting all the filesystems. If
mountall is terminated before that then this would be because of an
erroroneous condition on which you want to shut down and so restarting the
mountall Server would not be necessary.

369. By Surbhi Palande on 2011-07-15

Disconnect from the dbus server only if it was successfully connected
previously

370. By Surbhi Palande on 2011-07-15

Changed the interface to stop/restart timers to use a mountpoint rather than
the device name. This is useful in situations where the device mentioned in
/etc/fstab is not the device used for mounting because of the change mount
device interface. The mountpoint remains constant in all cases and is also
easier to use that specifying a device with uuids for eg.

371. By Surbhi Palande on 2011-07-15

Review fixes

372. By Surbhi Palande on 2011-07-15

Removed the destination for copy_exec and the unnecessary echoes

373. By Surbhi Palande on 2011-07-15

Added the shell execution exclamation mark to the mountall script

Unmerged revisions

373. By Surbhi Palande on 2011-07-15

Added the shell execution exclamation mark to the mountall script

372. By Surbhi Palande on 2011-07-15

Removed the destination for copy_exec and the unnecessary echoes

371. By Surbhi Palande on 2011-07-15

Review fixes

370. By Surbhi Palande on 2011-07-15

Changed the interface to stop/restart timers to use a mountpoint rather than
the device name. This is useful in situations where the device mentioned in
/etc/fstab is not the device used for mounting because of the change mount
device interface. The mountpoint remains constant in all cases and is also
easier to use that specifying a device with uuids for eg.

369. By Surbhi Palande on 2011-07-15

Disconnect from the dbus server only if it was successfully connected
previously

368. By Surbhi Palande on 2011-07-15

Removed the previously added term_handler for the following reasons:
1) You need to disconnect from the dbus_server and unref it only once.
This must happen when mountall finishes mounting all the filesystems. If
mountall is terminated before that then this would be because of an
erroroneous condition on which you want to shut down and so restarting the
mountall Server would not be necessary.

367. By Surbhi Palande on 2011-07-15

Changed the DATA hook to SCRIPT hook to preserve the +x flag on the mountall
hook for initramfs.

366. By Surbhi Palande on 2011-07-11

Changed the default mountall hook name to mountall.

365. By Surbhi Palande on 2011-07-11

Fixed the installation of upstart jobs to event-driven dir in the
/usr/share/initramfs-tools/event-driven/

364. By Surbhi Palande on 2011-07-11

Added the missing debian/initramfs/upstart-jobs/Makefile.am for installing the
upstart jobs related to the functioning of the event driven initramfs

=== modified file 'Makefile.am'
--- Makefile.am	2009-11-29 20:02:43 +0000
+++ Makefile.am	2011-07-15 11:51:33 +0000
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl dbus src conf man po
+SUBDIRS = intl dbus util src conf debian/initramfs debian/initramfs/upstart-jobs/ man po 
 
 EXTRA_DIST = config.rpath
 
 
=== modified file 'Makefile.in'
--- Makefile.in	2011-03-01 21:34:04 +0000
+++ Makefile.in	2011-07-15 11:51:33 +0000
@@ -301,7 +301,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = intl dbus src conf man po
+SUBDIRS = intl dbus util src conf debian/initramfs debian/initramfs/upstart-jobs/ man po 
 EXTRA_DIST = config.rpath
 ACLOCAL_AMFLAGS = --install -I m4
 all: config.h
 
=== modified file 'configure'
--- configure	2011-04-13 12:59:22 +0000
+++ configure	2011-07-15 11:51:33 +0000
@@ -708,7 +708,7 @@
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
-ac_unique_file="src/mountall.c"
+ac_unique_file="util/mntctl.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -17545,7 +17545,7 @@
 
 
 
-ac_config_files="$ac_config_files Makefile intl/Makefile dbus/Makefile src/Makefile conf/Makefile man/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile intl/Makefile dbus/Makefile src/Makefile conf/Makefile util/Makefile man/Makefile po/Makefile.in debian/initramfs/Makefile debian/initramfs/upstart-jobs/Makefile"
 
 ac_config_headers="$ac_config_headers config.h"
 
@@ -18540,8 +18540,11 @@
     "dbus/Makefile") CONFIG_FILES="$CONFIG_FILES dbus/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "conf/Makefile") CONFIG_FILES="$CONFIG_FILES conf/Makefile" ;;
+    "util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;;
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+    "debian/initramfs/Makefile") CONFIG_FILES="$CONFIG_FILES debian/initramfs/Makefile" ;;
+    "debian/initramfs/upstart-jobs/Makefile") CONFIG_FILES="$CONFIG_FILES debian/initramfs/upstart-jobs/Makefile" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
 
=== modified file 'configure.ac'
--- configure.ac	2011-04-13 12:59:22 +0000
+++ configure.ac	2011-07-15 11:51:33 +0000
@@ -3,7 +3,7 @@
 AC_PREREQ(2.62)
 AC_INIT([mountall], [2.26], [[e-mail]])
 AC_COPYRIGHT([[Copyright © 2010 Canonical Ltd.]])
-AC_CONFIG_SRCDIR([src/mountall.c])
+AC_CONFIG_SRCDIR([util/mntctl.c])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_GNU_SOURCE
@@ -49,6 +49,8 @@
 
 AC_CONFIG_FILES([ Makefile intl/Makefile
 		  dbus/Makefile src/Makefile conf/Makefile
-		  man/Makefile po/Makefile.in ])
+		  util/Makefile man/Makefile po/Makefile.in 
+		  debian/initramfs/Makefile 
+		  debian/initramfs/upstart-jobs/Makefile])
 AC_CONFIG_HEADERS([config.h])
 AC_OUTPUT
 
=== modified file 'dbus/Makefile.am'
--- dbus/Makefile.am	2009-09-14 22:31:57 +0000
+++ dbus/Makefile.am	2011-07-15 11:51:33 +0000
@@ -1,5 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 
+
+dbus_configdir = $(sysconfdir)/dbus-1/system.d
+dist_dbus_config_DATA = Mountall.Server.conf
+
 EXTRA_DIST = \
 	upstart.h \
 	com.ubuntu.Upstart.xml
 
=== modified file 'dbus/Makefile.in'
--- dbus/Makefile.in	2011-03-01 21:34:04 +0000
+++ dbus/Makefile.in	2011-07-15 11:51:33 +0000
@@ -14,6 +14,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -34,7 +35,8 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = dbus
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_dbus_config_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
@@ -70,6 +72,29 @@
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(dbus_configdir)"
+DATA = $(dist_dbus_config_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -245,6 +270,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+dbus_configdir = $(sysconfdir)/dbus-1/system.d
+dist_dbus_config_DATA = Mountall.Server.conf
 EXTRA_DIST = \
 	upstart.h \
 	com.ubuntu.Upstart.xml
@@ -288,6 +315,26 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
+install-dist_dbus_configDATA: $(dist_dbus_config_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(dbus_configdir)" || $(MKDIR_P) "$(DESTDIR)$(dbus_configdir)"
+	@list='$(dist_dbus_config_DATA)'; test -n "$(dbus_configdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbus_configdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dbus_configdir)" || exit $$?; \
+	done
+
+uninstall-dist_dbus_configDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_dbus_config_DATA)'; test -n "$(dbus_configdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(dbus_configdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(dbus_configdir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -327,8 +374,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(dbus_configdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -374,7 +424,7 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-dist_dbus_configDATA
 
 install-dvi: install-dvi-am
 
@@ -418,20 +468,21 @@
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-dist_dbus_configDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	install-data install-data-am install-dist_dbus_configDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-dist_dbus_configDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 
=== added file 'dbus/Mountall.Server.conf'
--- dbus/Mountall.Server.conf	1970-01-01 00:00:00 +0000
+++ dbus/Mountall.Server.conf	2011-07-15 11:51:33 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE busconfig PUBLIC
+  "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+  <!-- Only the root user can own the Mountall name -->
+  <policy user="root">
+    <allow own="com.ubuntu.Mountall.Server" />
+  </policy>
+
+  <!-- Permit the root user to invoke all of the methods on Mountall-->
+  <policy user="root">
+    <allow send_destination="com.ubuntu.Mountall.Server"
+	   send_interface="org.freedesktop.DBus.Properties" />
+
+    <allow send_destination="com.ubuntu.Mountall.Server"
+	   send_interface="com.ubuntu.Mountall0_1.Server" />
+  </policy>
+
+  <!-- Allow any user to introspect Mountall's interfaces, to obtain the
+       values of properties (but not set them) and to invoke selected
+       methods on Mountall that are used to walk information. -->
+  <policy context="default">
+    <allow send_destination="com.ubuntu.Mountall.Server"
+	   send_interface="org.freedesktop.DBus.Introspectable" />
+
+    <allow send_destination="com.ubuntu.Mountall.Server"
+	   send_interface="org.freedesktop.DBus.Properties"
+	   send_type="method_call" send_member="Get" />
+    <allow send_destination="com.ubuntu.Mountall.Server"
+	   send_interface="org.freedesktop.DBus.Properties"
+	   send_type="method_call" send_member="GetAll" />
+  </policy>
+</busconfig>
 
=== added file 'dbus/com.ubuntu.Mountall.Server.xml'
--- dbus/com.ubuntu.Mountall.Server.xml	1970-01-01 00:00:00 +0000
+++ dbus/com.ubuntu.Mountall.Server.xml	2011-07-15 11:51:33 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- mountall 
+
+     com.ubuntu.Mountall.Server.xml - interface definition for Mountall Server
+
+     Copyright © 2011 Canonical Ltd.
+
+     This file is free software; Canonical Ltd gives unlimited permission
+     to copy and/or distribute it, with or without modifications, as long
+     as this notice is preserved.
+
+     Communication and interaction with Mountall through this interface is
+     permitted without restriction.
+  -->
+
+<!DOCTYPE node PUBLIC
+  "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+  "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+
+<node>
+  <interface name="com.ubuntu.Mountall0_1.Server">
+    <method name="StopTimer">
+      <arg name="mountpoint" type="s" direction="in" />
+    </method>
+
+    <method name="RestartTimer">
+      <arg name="mountpoint" type="s" direction="in" />
+    </method>
+
+    <method name="ChangeMountDevice">
+      <arg name="devname" type="s" direction="in" />
+      <arg name="path" type="s" direction="in" />
+    </method>
+
+    <!-- Basic information about Mountall-->
+    <property name="version" type="s" access="read" />
+  </interface>
+</node>
 
=== added file 'dbus/mountall.h'
--- dbus/mountall.h	1970-01-01 00:00:00 +0000
+++ dbus/mountall.h	2011-07-15 11:51:33 +0000
@@ -0,0 +1,49 @@
+/* mountall.h
+ *
+ * Copyright © 2009 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef DBUS_MNTALL_H
+#define DBUS_MNTALL_H
+
+/**
+ * DBUS_PATH_MNTALL:
+ *
+ * The object path used by the manager object, and used as the root path
+ * for all other objects.
+ **/
+#define DBUS_PATH_MNTALL "/com/ubuntu/Mountall/Server"
+
+
+/**
+ * DBUS_INTERFACE_MNTALL:
+ *
+ * The interface exported by the manager object.
+ **/
+#define DBUS_INTERFACE_MNTALL "com.ubuntu.Mountall0_1.Server"
+
+/**
+ * DBUS_ADDRESS_MNTALL:
+ *
+ * The address where the private D-Bus server inside Mountall can be
+ * found.
+ **/
+#ifndef DBUS_ADDRESS_MNTALL
+#define DBUS_ADDRESS_MNTALL "unix:abstract=/com/ubuntu/mountall/server/"
+#endif
+
+
+#endif /* DBUS_MNTALL_H */
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-04-13 12:59:22 +0000
+++ debian/changelog	2011-07-15 11:51:33 +0000
@@ -1,3 +1,29 @@
+mountall (2.27) UNRELEASED; urgency=low
+
+  * Added com.ubuntu.Mountall.server interface. Implemented the mntctl command
+    with 4 commands: 1. StopTimer 2. RestartTimer 3. ChangeMountDevice 4.
+    Version.
+  * Fixed the coding style bugs in the "timeout" option related code. Also
+    removed a break from the is_device_ready () to get the "device-not-ready"
+    event for all the devices which are marked with the timeout option and
+    which are not ready by the time the timer expires.
+  * Added debian/initramfs/Makefile.am to install mountall.initramfs-hook as
+    an initramfs hook that installs mntctl, mountall and other files needed by
+    an event driven initramfs. Also added
+    debian/initramfs/upstart-jobs/Makefile.am to install the upstart-jobs
+    related to mountall in the event driven initramfs. The current
+    mountall.conf execute as an upstart job in place of the "local" script in
+    the non-event driven initramfs
+    
+ -- Surbhi Palande <[e-mail]>  Wed, 29 Jun 2011 16:40:01 +0300
+
+mountall (2.26) oneiric; urgency=low
+
+  * Correct grammar on user-visible strings
+    (LP: #572016)
+
+ -- Bryce Harrington <[e-mail]>  Tue, 07 Jun 2011 12:16:22 -0700
+
 mountall (2.25ubuntu1) natty; urgency=low
 
   * Fixed two errors found while browsing the code: 1) find_mount("/") returns
 
=== added directory 'debian/initramfs'
=== added file 'debian/initramfs/Makefile.am'
--- debian/initramfs/Makefile.am	1970-01-01 00:00:00 +0000
+++ debian/initramfs/Makefile.am	2011-07-15 11:51:33 +0000
@@ -0,0 +1,4 @@
+## Process this file with automake to produce Makefile.in
+
+initramfshookdir = /usr/share/initramfs-tools/hooks
+initramfshook_SCRIPTS = mountall
 
=== added file 'debian/initramfs/Makefile.in'
--- debian/initramfs/Makefile.in	1970-01-01 00:00:00 +0000
+++ debian/initramfs/Makefile.in	2011-07-15 11:51:33 +0000
@@ -0,0 +1,499 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = debian/initramfs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax.m4 \
+	$(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnih.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(initramfshookdir)"
+SCRIPTS = $(initramfshook_SCRIPTS)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBC = @LTLIBC@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NIH_CFLAGS = @NIH_CFLAGS@
+NIH_DBUS_CFLAGS = @NIH_DBUS_CFLAGS@
+NIH_DBUS_LIBS = @NIH_DBUS_LIBS@
+NIH_DBUS_TOOL = @NIH_DBUS_TOOL@
+NIH_LIBS = @NIH_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@
+PLYMOUTH_LIBS = @PLYMOUTH_LIBS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WINDRES = @WINDRES@
+WOE32 = @WOE32@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+initramfshookdir = /usr/share/initramfs-tools/hooks
+initramfshook_SCRIPTS = mountall
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign debian/initramfs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign debian/initramfs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-initramfshookSCRIPTS: $(initramfshook_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(initramfshookdir)" || $(MKDIR_P) "$(DESTDIR)$(initramfshookdir)"
+	@list='$(initramfshook_SCRIPTS)'; test -n "$(initramfshookdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(initramfshookdir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(initramfshookdir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-initramfshookSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(initramfshook_SCRIPTS)'; test -n "$(initramfshookdir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(initramfshookdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(initramfshookdir)" && rm -f $$files
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS)
+installdirs:
+	for dir in "$(DESTDIR)$(initramfshookdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-initramfshookSCRIPTS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-initramfshookSCRIPTS
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-initramfshookSCRIPTS \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-initramfshookSCRIPTS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
 
=== added file 'debian/initramfs/mountall'
--- debian/initramfs/mountall	1970-01-01 00:00:00 +0000
+++ debian/initramfs/mountall	2011-07-15 11:51:33 +0000
@@ -0,0 +1,69 @@
+#!/bin/sh -e
+#event-driven initramfs hook for mountall
+
+PREREQ=""
+
+#Output prequisites
+prereqs()
+{
+	echo "$PREREQ"
+}
+
+if [ -z "$INITRAMFS_EVENT_DRIVEN" ]; then
+	exit 0;
+fi
+
+case $1 in
+    prereqs)
+	prereqs
+	exit 0
+	;;
+esac
+
+. /usr/share/initramfs-tools/hook-functions
+
+copy_exec /sbin/mountall
+copy_exec /sbin/mntctl
+mkdir -p ${DESTDIR}/lib/init/
+mkdir -p ${DESTDIR}/etc/dbus-1/system.d/
+cp /etc/dbus-1/system.d/Mountall.Server.conf ${DESTDIR}/etc/dbus-1/system.d/
+
+# Following is needed for mountall authentication with dbus
+cp	  /etc/passwd		${DESTDIR}/etc/
+if ! grep -q '^root:' ${DESTDIR}/etc/passwd 2>/dev/null; then
+	echo 'root:x:0:0:root:/root:/bin/sh' >> ${DESTDIR}/etc/passwd
+fi
+# we use our own nsswitch - used for mountall authentication with dbus
+# this is our dummy nss stack - uses libnss_files.so
+
+echo 'passwd:	files' >${DESTDIR}/etc/nsswitch.conf
+echo 'group:	files' >>${DESTDIR}/etc/nsswitch.conf
+
+libnss_compat=`dpkg -L libc6 | grep libnss_compat.so.2`
+if [ -f $libnss_compat ]; then
+	cp -uv $libnss_compat ${DESTDIR}/lib/libnss_compat.so.2
+else
+	echo "libnss_compat.so.2 not found"
+	echo "warning: mountall would not be able to connect to upstart"
+	exit 1
+fi
+
+libnss_files=`dpkg -L libc6 | grep libnss_files.so.2`
+if [ -f $libnss_files ]; then
+	cp -uv $libnss_files ${DESTDIR}/lib/libnss_files.so.2
+else
+	echo "libnss_files.so.2 not found"
+	echo "warning: mountall would not be able to connect to upstart"
+	exit 1
+fi
+
+libuuid=`dpkg -L libuuid1 | grep "libuuid.so.1$"`
+if [ -f $libuuid ]; then
+	cp -uv $libuuid ${DESTDIR}/lib/libuuid.so.1
+else
+	echo "libuuid.so.1 not found"
+	echo "warning: root device may not be discovered if uuid is used in fstab"
+	exit 1
+fi
+
+cp /etc/blkid.conf ${DESTDIR}/etc/
 
=== added directory 'debian/initramfs/upstart-jobs'
=== added file 'debian/initramfs/upstart-jobs/Makefile.am'
--- debian/initramfs/upstart-jobs/Makefile.am	1970-01-01 00:00:00 +0000
+++ debian/initramfs/upstart-jobs/Makefile.am	2011-07-15 11:51:33 +0000
@@ -0,0 +1,4 @@
+## Process this file with automake to produce Makefile.in
+
+upstart_jobs_initramfs_configdir = /usr/share/initramfs-tools/event-driven/upstart-jobs/
+upstart_jobs_initramfs_config_DATA = mountall.conf
 
=== added file 'debian/initramfs/upstart-jobs/Makefile.in'
--- debian/initramfs/upstart-jobs/Makefile.in	1970-01-01 00:00:00 +0000
+++ debian/initramfs/upstart-jobs/Makefile.in	2011-07-15 11:51:33 +0000
@@ -0,0 +1,486 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = debian/initramfs/upstart-jobs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax.m4 \
+	$(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnih.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(upstart_jobs_initramfs_configdir)"
+DATA = $(upstart_jobs_initramfs_config_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBC = @LTLIBC@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NIH_CFLAGS = @NIH_CFLAGS@
+NIH_DBUS_CFLAGS = @NIH_DBUS_CFLAGS@
+NIH_DBUS_LIBS = @NIH_DBUS_LIBS@
+NIH_DBUS_TOOL = @NIH_DBUS_TOOL@
+NIH_LIBS = @NIH_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@
+PLYMOUTH_LIBS = @PLYMOUTH_LIBS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WINDRES = @WINDRES@
+WOE32 = @WOE32@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+upstart_jobs_initramfs_configdir = /usr/share/initramfs-tools/event-driven/upstart-jobs/
+upstart_jobs_initramfs_config_DATA = mountall.conf
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign debian/initramfs/upstart-jobs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign debian/initramfs/upstart-jobs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-upstart_jobs_initramfs_configDATA: $(upstart_jobs_initramfs_config_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(upstart_jobs_initramfs_configdir)" || $(MKDIR_P) "$(DESTDIR)$(upstart_jobs_initramfs_configdir)"
+	@list='$(upstart_jobs_initramfs_config_DATA)'; test -n "$(upstart_jobs_initramfs_configdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(upstart_jobs_initramfs_configdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(upstart_jobs_initramfs_configdir)" || exit $$?; \
+	done
+
+uninstall-upstart_jobs_initramfs_configDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(upstart_jobs_initramfs_config_DATA)'; test -n "$(upstart_jobs_initramfs_configdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(upstart_jobs_initramfs_configdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(upstart_jobs_initramfs_configdir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(upstart_jobs_initramfs_configdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-upstart_jobs_initramfs_configDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-upstart_jobs_initramfs_configDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	install-upstart_jobs_initramfs_configDATA installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-upstart_jobs_initramfs_configDATA
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
 
=== added file 'debian/initramfs/upstart-jobs/mountall.conf'
--- debian/initramfs/upstart-jobs/mountall.conf	1970-01-01 00:00:00 +0000
+++ debian/initramfs/upstart-jobs/mountall.conf	2011-07-15 11:51:33 +0000
@@ -0,0 +1,27 @@
+# mountall - Mount filesystems on boot
+#
+# This helper mounts filesystems in the correct order as the devices
+# and mountpoints become available.
+
+description	"Mount filesystems on boot"
+
+start on stopping boot-premount
+stop on filesystem
+
+expect daemon
+task
+
+emits virtual-filesystems
+emits local-filesystems
+emits remote-filesystems
+emits all-swaps
+emits filesystem
+emits mounting
+emits mounted
+emits device-not-ready
+
+# temporary, until we have progress indication
+# and output capture (next week :p)
+console output
+
+exec mountall --daemon
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-03-12 18:22:45 +0000
+++ src/Makefile.am	2011-07-15 11:51:33 +0000
@@ -21,9 +21,13 @@
 	mountall
 
 mountall_SOURCES = \
-	mountall.c
+	control.c control.h mountall.c
+
 nodist_mountall_SOURCES = \
-	$(com_ubuntu_Upstart_OUTPUTS)
+	$(com_ubuntu_Upstart_OUTPUTS) \
+	$(com_ubuntu_Mountall_Server_OUTPUTS)
+
+
 mountall_LDADD = \
 	$(NIH_LIBS) \
 	$(NIH_DBUS_LIBS) \
@@ -32,7 +36,6 @@
 	$(PLYMOUTH_LIBS) \
 	$(LTLIBINTL)
 
-
 com_ubuntu_Upstart_OUTPUTS = \
 	com.ubuntu.Upstart.c \
 	com.ubuntu.Upstart.h
@@ -42,19 +45,35 @@
 
 $(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML)
 	$(NIH_DBUS_TOOL) \
-		--package=$(PACAKGE) \
+		--package=$(PACKAGE) \
 		--mode=proxy --prefix=upstart \
 		--default-interface=com.ubuntu.Upstart0_6 \
 		--output=$@ $<
 
+com_ubuntu_Mountall_Server_OUTPUTS = \
+	com.ubuntu.Mountall.Server.c \
+	com.ubuntu.Mountall.Server.h
+
+com_ubuntu_Mountall_Server_XML = \
+	../dbus/com.ubuntu.Mountall.Server.xml
+
+$(com_ubuntu_Mountall_Server_OUTPUTS): $(com_ubuntu_Mountall_Server_XML)
+	$(NIH_DBUS_TOOL) \
+		--package=$(PACKAGE) \
+		--mode=object --prefix=control \
+		--default-interface=com.ubuntu.Mountall0_1.Server \
+		--output=$@ $<
+
 
 # These have to be built sources because we can't compile object files
 # without the header file existing first
 BUILT_SOURCES = \
-	$(com_ubuntu_Upstart_OUTPUTS)
+	$(com_ubuntu_Upstart_OUTPUTS) \
+	$(com_ubuntu_Mountall_Server_OUTPUTS)
 
 CLEANFILES = \
-	$(com_ubuntu_Upstart_OUTPUTS)
+	$(com_ubuntu_Upstart_OUTPUTS) \
+	$(com_ubuntu_Mountall_Server_OUTPUTS)
 
 
 clean-local:
 
=== modified file 'src/Makefile.in'
--- src/Makefile.in	2011-03-01 21:34:04 +0000
+++ src/Makefile.in	2011-07-15 11:51:33 +0000
@@ -68,9 +68,10 @@
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(initdir)"
 PROGRAMS = $(sbin_PROGRAMS)
-am_mountall_OBJECTS = mountall.$(OBJEXT)
+am_mountall_OBJECTS = control.$(OBJEXT) mountall.$(OBJEXT)
 am__objects_1 = com.ubuntu.Upstart.$(OBJEXT)
-nodist_mountall_OBJECTS = $(am__objects_1)
+am__objects_2 = com.ubuntu.Mountall.Server.$(OBJEXT)
+nodist_mountall_OBJECTS = $(am__objects_1) $(am__objects_2)
 mountall_OBJECTS = $(am_mountall_OBJECTS) $(nodist_mountall_OBJECTS)
 am__DEPENDENCIES_1 =
 mountall_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -321,10 +322,11 @@
 initdir = $(libdir)/init
 dist_init_DATA = fstab
 mountall_SOURCES = \
-	mountall.c
+	control.c control.h mountall.c
 
 nodist_mountall_SOURCES = \
-	$(com_ubuntu_Upstart_OUTPUTS)
+	$(com_ubuntu_Upstart_OUTPUTS) \
+	$(com_ubuntu_Mountall_Server_OUTPUTS)
 
 mountall_LDADD = \
 	$(NIH_LIBS) \
@@ -341,14 +343,23 @@
 com_ubuntu_Upstart_XML = \
 	../dbus/com.ubuntu.Upstart.xml
 
+com_ubuntu_Mountall_Server_OUTPUTS = \
+	com.ubuntu.Mountall.Server.c \
+	com.ubuntu.Mountall.Server.h
+
+com_ubuntu_Mountall_Server_XML = \
+	../dbus/com.ubuntu.Mountall.Server.xml
+
 
 # These have to be built sources because we can't compile object files
 # without the header file existing first
 BUILT_SOURCES = \
-	$(com_ubuntu_Upstart_OUTPUTS)
+	$(com_ubuntu_Upstart_OUTPUTS) \
+	$(com_ubuntu_Mountall_Server_OUTPUTS)
 
 CLEANFILES = \
-	$(com_ubuntu_Upstart_OUTPUTS)
+	$(com_ubuntu_Upstart_OUTPUTS) \
+	$(com_ubuntu_Mountall_Server_OUTPUTS)
 
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -438,7 +449,9 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/com.ubuntu.Mountall.Server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/com.ubuntu.Upstart.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/control.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountall.Po@am__quote@
 
 .c.o:
@@ -701,11 +714,18 @@
 
 $(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML)
 	$(NIH_DBUS_TOOL) \
-		--package=$(PACAKGE) \
+		--package=$(PACKAGE) \
 		--mode=proxy --prefix=upstart \
 		--default-interface=com.ubuntu.Upstart0_6 \
 		--output=$@ $<
 
+$(com_ubuntu_Mountall_Server_OUTPUTS): $(com_ubuntu_Mountall_Server_XML)
+	$(NIH_DBUS_TOOL) \
+		--package=$(PACKAGE) \
+		--mode=object --prefix=control \
+		--default-interface=com.ubuntu.Mountall0_1.Server \
+		--output=$@ $<
+
 clean-local:
 	rm -f *.gcno *.gcda
 
 
=== added file 'src/control.c'
--- src/control.c	1970-01-01 00:00:00 +0000
+++ src/control.c	2011-07-15 11:51:33 +0000
@@ -0,0 +1,258 @@
+/* mountall 
+ *
+ * Copyright © 2010 Canonical Ltd.
+ * Author: Surbhi A. Palande <[e-mail]>
+ *
+ * This file is based on control.c in upstart whose
+ * Author: Scott James Remnant <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <dbus/dbus.h>
+
+#include <nih/macros.h>
+#include <nih/alloc.h>
+#include <nih/string.h>
+#include <nih/list.h>
+#include <nih/io.h>
+#include <nih/main.h>
+#include <nih/logging.h>
+#include <nih/error.h>
+#include <nih/errors.h>
+
+#include <nih-dbus/dbus_error.h>
+#include <nih-dbus/dbus_connection.h>
+#include <nih-dbus/dbus_message.h>
+#include <nih-dbus/dbus_object.h>
+
+#include "dbus/mountall.h"
+#include "com.ubuntu.Mountall.Server.h"
+#include "mountall.h"
+
+extern const char *package_string;
+
+/* Prototypes for static functions */
+static int   control_server_connect (DBusServer *server, DBusConnection *conn);
+static void  control_disconnected   (DBusConnection *conn);
+static void  control_register_all   (DBusConnection *conn);
+
+/**
+ * control_server
+ * 
+ * D-Bus server listening for new direct connections.
+ **/
+DBusServer *control_server = NULL;
+
+
+/**
+ * control_server_address:
+ *
+ * Address on which the control server may be reached.
+ **/
+const char * control_server_address = DBUS_ADDRESS_MNTALL;
+
+/**
+ * control_server_open:
+ *
+ * Open a listening D-Bus server and store it in the control_server global.
+ * New connections are permitted from the root user, and handled
+ * automatically in the main loop.
+ *
+ * Returns: zero on success, negative value on raised error.
+ **/
+
+int
+control_server_open (void)
+{
+	nih_assert (control_server == NULL);
+
+	control_server = nih_dbus_server (control_server_address,
+				  control_server_connect,
+				  control_disconnected);
+	if (! control_server)
+		return -1;
+
+	nih_debug("Mountall0_1.Server started at address: %s", control_server_address);
+
+	return 0;
+}
+
+/**
+ * control_server_connect:
+ *
+ * Called when a new client connects to our server and is used to register
+ * objects on the new connection.
+ *
+ * Returns: always TRUE.
+ **/
+static int
+control_server_connect (DBusServer     *server,
+			DBusConnection *conn)
+{
+	nih_assert (server != NULL);
+	nih_assert (server == control_server);
+	nih_assert (conn != NULL);
+
+	/* Register objects on the connection. */
+	control_register_all (conn);
+
+	nih_debug("Mountall0_1.Server::Connection from private client");
+
+	return TRUE;
+}
+
+/**
+ * control_register_all:
+ * @conn: connection to register objects for.
+ *
+ * Registers the manager object and objects for all jobs and instances on
+ * the given connection.
+ **/
+static void
+control_register_all (DBusConnection *conn)
+{
+	nih_assert (conn != NULL);
+
+	/* Register the manager object, this is the primary point of contact
+	 * for clients.  We only check for success, otherwise we're happy
+	 * to let this object be tied to the lifetime of the connection.
+	 */
+	NIH_MUST (nih_dbus_object_new (NULL, conn, DBUS_PATH_MNTALL,
+				       control_interfaces, NULL));
+}
+
+/**
+ * control_disconnected:
+ *
+ * This function is called when the connection to the D-Bus system bus,
+ * or a client connection to our D-Bus server, is dropped and our reference
+ * is about to be list.  We clear the connection from our current list
+ * and drop the control_bus global if relevant.
+ **/
+static void
+control_disconnected (DBusConnection *conn)
+{
+	nih_assert (conn != NULL);
+}
+
+/**
+ * control_stop_timer:
+ * @mountpoint: the mountpoint corresponding to the device for which the
+ * timeout option has to be disabled.
+ *
+ * Implements the StopTimer method of com.ubuntu.Moutall01_Server
+ * interface.
+ *
+ * This function is called for stopping a previously started timer for a
+ * mountpoint. Stopping a timer has the effect that mountall would no longer
+ * expect the corresponding device to be ready within a previously registered
+ * stiplulated time period. After this call, mountall will wait endlessly till
+ * the device becomes ready. Use this function only when you know that you
+ * might restart the timer later or that you really want to wait endlessly
+ * till the device becomes available.
+ *
+ * Returns 0 on success and -1 on failure.
+ **/
+int
+control_stop_timer  (void *data, 
+		     NihDBusMessage *message,
+		     const char *mountpoint)
+{
+
+	nih_assert (mountpoint != NULL);
+	nih_assert (message != NULL);
+
+	return stop_dev_timer (mountpoint);
+}
+
+/**
+ * control_restart_timer:
+ * @mountpoint: the mountpoint corresponding to the device for which the
+ * timeout option has to be disabled.
+ *
+ * Implements the RestartTimer method of com.ubuntu.Moutall01_Server
+ * interface.
+ *
+ * This function is called for restarting a previously stopped timer for a
+ * mountpoint. After successfully restarting a timer, mountall will expect the
+ * corresponding device to become ready for mounting within the previously
+ * configured timeout or the default of 30 seconds.
+ *
+ * Returns 0 on success and -1 on failure.
+ **/
+int
+control_restart_timer (void *data,
+		       NihDBusMessage *message,
+		       const char *mountpoint)
+{
+
+	nih_assert (mountpoint != NULL);
+	nih_assert (message != NULL);
+
+	return restart_dev_timer (mountpoint);
+}
+
+/**
+ * control_change_mount_device:
+ * @devname: Name of the new device which you want to mount at @path.
+ * @path: Complete path which matches with the one found in /etc/fstab or what
+ * mountall already considers.
+ *
+ * Implements the ChangeMountDevice method of com.ubuntu.Moutall01_Server
+ * interface.
+ *
+ * Call this function to change the device to mount to an existing previous
+ * mountpoint.
+ **/
+int
+control_change_mount_device (void *data, 
+		       NihDBusMessage *message,
+		       const char *devname,
+		       const char *path)
+{
+	nih_assert (devname != NULL);
+	nih_assert (path != NULL);
+
+	return change_mount_device (devname, path);
+}
+
+/**
+ * control_get_version:
+ * @data: not used,
+ * @message: D-Bus connection and message received,
+ * @version: pointer for reply string.
+ *
+ * Implements the get method for the version property of the
+ * com.ubuntu.Mountall0_1.Server interface.
+ *
+ * Called to obtain the version of the init daemon, which will be stored
+ * as a string in @version.
+ *
+ * Returns: zero on success, negative value on raised error.
+ **/
+int
+control_get_version (void *data,
+	             NihDBusMessage *message,
+		     char **version)
+{
+	nih_assert (message != NULL);
+	nih_assert (version != NULL);
+
+	*version = nih_strdup (message, package_string);
+	if (!*version)
+		nih_return_no_memory_error (-1);
+
+	return 0;
+}
 
=== added file 'src/control.h'
--- src/control.h	1970-01-01 00:00:00 +0000
+++ src/control.h	2011-07-15 11:51:33 +0000
@@ -0,0 +1,36 @@
+/* mountall 
+ *
+ * Copyright © 2010 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "dbus/mountall.h"
+
+extern DBusServer *control_server;
+extern const NihDBusInterface *control_interfaces[];
+
+int control_server_open (void);
+int control_stop_timer  (void *data, NihDBusMessage *message, 
+						const char *mountpoint)
+	__attribute__ ((warn_unused_result));
+int control_restart_timer (void *data, NihDBusMessage *message,
+	       					const char *mountpoint)
+	__attribute__ ((warn_unused_result));
+int control_change_mount_device (void *data, NihDBusMessage *message, 
+				const char *devname, const char *path)
+	__attribute__ ((warn_unused_result));
+int control_get_version (void *data, NihDBusMessage *message, 
+						char **value)
+	__attribute__ ((warn_unused_result));
 
=== modified file 'src/mountall.c'
--- src/mountall.c	2011-04-13 12:59:22 +0000
+++ src/mountall.c	2011-07-15 11:51:33 +0000
@@ -71,6 +71,7 @@
 
 #include "dbus/upstart.h"
 #include "com.ubuntu.Upstart.h"
+#include "control.h"
 
 
 #define BUILTIN_FSTAB   "/lib/init/fstab"
@@ -1342,7 +1343,7 @@
 
 	/* TAG_TIMEOUT is TAG_LOCAL with a timeout. timeout cannot be
 	 * inherited but local could be */
-	if(tag == TAG_TIMEOUT)
+	if (tag == TAG_TIMEOUT)
 		tag = TAG_LOCAL;
 
 	if ((tag == TAG_LOCAL)
@@ -1448,7 +1449,7 @@
 		num_local_mounted++;
 		num_timeout_mounted++;
 		if (num_timeout_mounted == num_timeout) {
-			nih_message(_("\n %s finished! "), "local_timeout");
+			nih_message (_("\n %s finished! "), "local_timeout");
 			/* Stop the timeout waiting for device to get ready"
 			 */
 			if (device_ready_timer) {
@@ -1596,9 +1597,22 @@
 		   num_swap_mounted, num_swap);
 }
 
-
+/* 
+ * is_device_ready:
+ *
+ * @data: Not used
+ * @timer: timer which was preconfigured and on the expiry of which this
+ * function is called.
+ *
+ * This function is called to check if any device marked with the "timeout"
+ * option in the /etc/fstab is not ready when the preconfigured @timer
+ * expires.
+ * It emits a "device-not-ready" event when it finds that such a device is not
+ * yet ready.
+ */
 void
-is_device_ready(void *    data, NihTimer *timer)
+is_device_ready (void * data,
+		 NihTimer *timer)
 {
 	device_ready_timer = NULL;
 	NIH_LIST_FOREACH (mounts, iter) {
@@ -1617,17 +1631,20 @@
 			|| (! strncmp (mnt->device, "UUID=", 5))
 			|| (! strncmp (mnt->device, "LABEL=", 6))))
 		{
-			nih_message("%s device not ready in ROOTDELAY sec", MOUNT_NAME (mnt));
-			emit_event("device-not-ready", mnt);
-			break;
-
+			nih_message ("%s device not ready in ROOTDELAY sec", MOUNT_NAME (mnt));
+			emit_event ("device-not-ready", mnt);
 		}
-
 	}
-	
 }
 
-void activate_timer()
+/* 
+ * activate_timer:
+ *
+ * This function is called to start a timer when the first device with
+ * "timeout" option is found.
+ */
+void 
+activate_timer (void)
 {
 	NIH_LIST_FOREACH (mounts, iter) {
 		Mount *mnt = (Mount *)iter;
@@ -1647,9 +1664,9 @@
 			|| (! strncmp (mnt->device, "UUID=", 5))
 			|| (! strncmp (mnt->device, "LABEL=", 6))))
 		{
-			if(!dev_wait_time)
+			if (!dev_wait_time)
 				dev_wait_time = ROOTDELAY;
-			nih_message(_("Shall wait for device: %s for %d seconds, starting timer"), MOUNT_NAME (mnt), dev_wait_time);
+			nih_debug ("Shall wait for device: %s for %d seconds, starting timer", MOUNT_NAME (mnt), dev_wait_time);
 			device_ready_timer = NIH_MUST (nih_timer_add_timeout (NULL, 
 						dev_wait_time, is_device_ready, NULL));
 			break;
@@ -1682,8 +1699,13 @@
 			}
 		}
 
-		if (all)
+		if (all) {
+			if (control_server) {
+				dbus_server_disconnect (control_server);
+				dbus_server_unref (control_server);
+			}
 			nih_main_loop_exit (EXIT_OK);
+		}
 	}
 }
 
@@ -1971,7 +1993,7 @@
 		 */
 		if ((errno != EEXIST)
 		    && has_option (mnt, "optional", FALSE)) {
-			nih_debug ("%s: mountpoint doesn't exist, ignoring",
+			nih_debug ("%s: mountpoint doesn't exist; ignoring",
 				   MOUNT_NAME (mnt));
 			mounted (mnt);
 			return;
@@ -3158,37 +3180,37 @@
 	/* Display that message */
 	switch (plymouth_error) {
 	case ERROR_BORED:
-		message = NIH_MUST (nih_sprintf (NULL,_("The disk drive for %s is not ready yet or not present"),
+		message = NIH_MUST (nih_sprintf (NULL,_("The disk drive for %s is not ready yet or not present."),
 						 MOUNT_NAME (plymouth_mnt)));
 		keys_message = NIH_MUST (nih_sprintf (NULL, "keys:%s",
-						      _("Continue to wait; or Press S to skip mounting or M for manual recovery")));
+						      _("Continue to wait, or Press S to skip mounting or M for manual recovery")));
 		plymouth_keys = "SsMm";
 		break;
 	case ERROR_FSCK_FAILED:
-		message = NIH_MUST (nih_sprintf (NULL,_("Errors were found while checking the disk drive for %s"),
+		message = NIH_MUST (nih_sprintf (NULL,_("Errors were found while checking the disk drive for %s."),
 						 MOUNT_NAME (plymouth_mnt)));
 		keys_message = NIH_MUST (nih_sprintf (NULL, "keys:%s",
-						      _("Press F to attempt to fix the errors, I to ignore, S to skip mounting or M for manual recovery")));
+						      _("Press F to attempt to fix the errors, I to ignore, S to skip mounting, or M for manual recovery")));
 		plymouth_keys = "FfIiSsMm";
 		break;
 	case ERROR_FSCK_FAILED_HARD:
-		message = NIH_MUST (nih_sprintf (NULL,_("Serious errors were found while checking the disk drive for %s"),
+		message = NIH_MUST (nih_sprintf (NULL,_("Serious errors were found while checking the disk drive for %s."),
 						 MOUNT_NAME (plymouth_mnt)));
 		keys_message = NIH_MUST (nih_sprintf (NULL, "keys:%s",
-						      _("Press I to ignore, S to skip mounting or M for manual recovery")));
+						      _("Press I to ignore, S to skip mounting, or M for manual recovery")));
 		plymouth_keys = "IiSsMm";
 		break;
 	case ERROR_MOUNT_FAILED:
-		message = NIH_MUST (nih_sprintf (NULL, _("An error occurred while mounting %s"),
+		message = NIH_MUST (nih_sprintf (NULL, _("An error occurred while mounting %s."),
 						 MOUNT_NAME (plymouth_mnt)));
 		keys_message = NIH_MUST (nih_sprintf (NULL, "keys:%s",
 						      _("Press S to skip mounting or M for manual recovery")));
 		plymouth_keys = "SsMm";
 		break;
 	case ERROR_FSCK_IN_PROGRESS:
-		message = NIH_MUST (nih_strdup (NULL, _("Your disk drives are being checked for errors. This may take some time")));
+		message = NIH_MUST (nih_strdup (NULL, _("Checking disk drives are for errors. This may take several minutes.")));
 		keys_message = NIH_MUST (nih_sprintf (NULL, "keys:%s",
-						      _("Press C to cancel all checks currently in progress")));
+						      _("Press C to cancel all checks in progress")));
 		plymouth_keys = "Cc";
 		break;
 	default:
@@ -3334,21 +3356,35 @@
 	}
 }
 
-int set_dev_wait_time(NihOption *option, const char *arg)
+/*
+ * set_dev_wait_time:
+ *
+ * @option: Not used
+ * @arg: String receieved at the mountall command line by nih_option_parser
+ * and passed to this function for parsing.
+ *
+ * This function is used to set the "dev_wait_time option" argument specified
+ * at the mountall command line. It is called by the nih_option_parser for
+ * parsing the argument string specified by @arg
+ *
+ */
+int
+set_dev_wait_time (NihOption *option,
+		   const char *arg)
 {
         char * end_ptr;
-        dev_wait_time = strtol(arg, &end_ptr, 10);
+        dev_wait_time = strtol (arg, &end_ptr, 10);
         int err = 0;
-        if(dev_wait_time <= 0) {
-                nih_error(_("\n Legal values of dev-wait-time lie between 1sec to 2147483647 sec"));
+        if (dev_wait_time <= 0) {
+                nih_error (_("\n Legal values of dev-wait-time lie between 1sec to 2147483647 sec"));
                 err = -1;
         }
         else if ((dev_wait_time == LONG_MIN) || (dev_wait_time == LONG_MAX)) {
-                nih_error(_("\n Legal values of dev-wait-time lie between 1sec to 2147483647 sec"));
+                nih_error (_("\n Legal values of dev-wait-time lie between 1sec to 2147483647 sec"));
                 err = -1;
         }
         else if (*end_ptr != '\0') {
-                nih_error(_("\n Legal values of dev-wait-time lie between 1sec to 2147483647 sec"));
+                nih_error (_("\n Legal values of dev-wait-time lie between 1sec to 2147483647 sec"));
                 err = -1;
         }
         return err;
@@ -3356,6 +3392,195 @@
 
 
 /**
+ * stop_mountpoint_timer:
+ * @mountpoint: mountpoint whose timer you want to stop.
+ *
+ * This function is called to stop a previously started timer of a device
+ * Note that for this function to be successful, @mountpoint should be a
+ * mountpoint corresponding to a device whose "timeout" option is set in the
+ * /etc/fstab.
+ *
+ * Returns 0 on stopping the timer and -1 on not doing so.
+ *
+ **/
+int
+stop_dev_timer (const char *mountpoint)
+{
+	int ret = -1;
+
+	nih_assert (mountpoint != NULL);
+
+	if (strlen (mountpoint) == 0) {
+		nih_message (_("Empty mountpoint specified"));
+		return ret;
+	}
+
+	NIH_LIST_FOREACH (mounts, iter) {
+		Mount *mnt = (Mount *)iter;
+
+		if (mnt->mounted)
+			continue;
+		if (mnt->tag != TAG_TIMEOUT)
+			continue;
+
+                if ((! mnt->ready)
+                    && (! mnt->nodev)
+                    && (! is_remote (mnt))
+                    && ((! strncmp (mnt->device, "/dev/", 5))
+                        || (! strncmp (mnt->device, "UUID=", 5))
+                        || (! strncmp (mnt->device, "LABEL=", 6)))
+                    && (! strcmp (mnt->mountpoint, mountpoint)))
+                {
+			if (device_ready_timer) {
+				nih_debug ("Stopping the timer for the device:"
+					"%s for %d seconds, starting timer", 
+					MOUNT_NAME (mnt), dev_wait_time);
+	                        nih_free (device_ready_timer);
+				device_ready_timer = NULL;
+				ret = 0;
+			}
+                        break;
+
+                }
+	}
+	return ret;
+}
+
+/**
+ * restart_dev_timer:
+ ** @mountpoint: mountpoint whose timer you want to stop.
+ *
+ * This function is called to restart a previously stopped timer of a device
+ * Note that for this function to be successful, @mountpoint should be a
+ * mountpoint corresponding to a device whose "timeout" option is set in the
+ * /etc/fstab.
+ *
+ * Returns 0 on restarting the timer and -1 on not doing so.
+ *
+ **/
+int
+restart_dev_timer (const char *mountpoint)
+{
+	int ret = -1;
+
+	nih_assert (mountpoint != NULL);
+
+	if (strlen (mountpoint) == 0) {
+		nih_message (_("Empty mountpoint specified"));
+		return ret;
+	}
+
+	NIH_LIST_FOREACH (mounts, iter) {
+		Mount *mnt = (Mount *)iter;
+
+		if (mnt->mounted)
+			continue;
+		if (mnt->tag != TAG_TIMEOUT)
+			continue;
+
+                if ((! mnt->ready)
+                    && (! mnt->nodev)
+                    && (! is_remote (mnt))
+                    && ((! strncmp (mnt->device, "/dev/", 5))
+                        || (! strncmp (mnt->device, "UUID=", 5))
+                        || (! strncmp (mnt->device, "LABEL=", 6)))
+                    && (! strcmp (mnt->mountpoint, mountpoint)))
+                {
+
+			if (!dev_wait_time)
+				dev_wait_time = ROOTDELAY;
+			if (!device_ready_timer) {
+				nih_debug ("Shall wait for device: %s for %d "
+					"seconds, starting timer", 
+					MOUNT_NAME (mnt), dev_wait_time);
+				device_ready_timer = NIH_MUST (nih_timer_add_timeout (NULL, 
+					dev_wait_time, is_device_ready, NULL));
+				ret = 0;
+			} 
+			break;
+
+                }
+	}
+	return ret;
+}
+
+/**
+ * change_mount_device:
+ * @devname: name of the new device.
+ * @path: full path to a previously existing mountpoint.
+ *
+ *  This function is called to change the device that would be mounted at a
+ *  given mountpoint without calling this function. Note that @path should be
+ *  what mountall has read from fstab or what mountall already knows for
+ *  mounting a device.
+ *
+ *  Return 0 on successfully changing the device and -1 on not doing so.
+ **/
+int
+change_mount_device (const char *devname,
+	             const char *path)
+{
+	int ret = -1;
+
+	nih_assert (devname != NULL);
+	nih_assert (path != NULL);
+
+	if (strlen (devname) == 0) {
+		nih_error(_("Empty device name specified"));
+		return ret;
+	}
+	if (strlen (path) == 0) {
+		nih_error (_("Empty mount point specified"));
+		return ret;
+	}
+
+	NIH_LIST_FOREACH (mounts, iter) {
+		Mount *mnt = (Mount *)iter;
+
+		if (mnt->mounted)
+			continue;
+		if (mnt->tag != TAG_TIMEOUT)
+			continue;
+
+                if ((! mnt->ready)
+                    && (!mnt->nodev)
+                    && (!is_remote (mnt))
+                    && ((!strncmp (mnt->device, "/dev/", 5))
+                        || (!strncmp (mnt->device, "UUID=", 5))
+                        || (!strncmp (mnt->device, "LABEL=", 6)))
+                    )
+                {
+			/* Change the device to be mounted on a pre-registered
+			 * mountpoint
+			 */
+			if ((!strcmp (mnt->mountpoint, path))) {
+				/* Change only if the requested device is
+				 * really any different than whats stored
+				 */
+				if (!strcmp (mnt->device, devname)) {
+					char * newdev;
+					ret = 0;
+					newdev  = nih_strdup (mounts, devname);
+					if (!newdev)  {
+						nih_error_raise_no_memory ();
+						nih_error (("Could not change the mountpoint "
+								"for device: %s"), devname);
+						ret = -1;
+					}
+					else {
+						nih_free (mnt->device);
+						mnt->device = newdev;
+						emit_event ("changed-device", mnt);
+					}
+				}
+				break;
+			}
+                }
+	}
+	return ret;
+}
+
+/**
  * options:
  *
  * Command-line options accepted by this program.
@@ -3554,6 +3779,21 @@
 
 	/* See what's already mounted */
 	mark_mounted ();
+	/* Create a listening server for private connections. */
+	while ((ret = control_server_open ()) < 0) {
+		NihError *err;
+
+		err = nih_error_get ();
+		if (err->number != ENOMEM) {
+			nih_warn ("%s: %s", _("Unable to listen for private"
+						"connections"), err->message);
+			nih_free (err);
+			break;
+		}
+		nih_free (err);
+	}
+	if (!ret)
+		emit_event("mountallServer", NULL);
 	/* Activate the timer for a fs that is local, unmounted and waits for
 	 * a device to be ready, before it can be mounted onto it. Timer on
 	 * only for fs not marked with a "nobootwait=1" */
 
=== added file 'src/mountall.h'
--- src/mountall.h	1970-01-01 00:00:00 +0000
+++ src/mountall.h	2011-07-15 11:51:33 +0000
@@ -0,0 +1,24 @@
+/* mountall 
+ *
+ * Copyright © 2010 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+int stop_dev_timer (const char * mountpoint)
+	__attribute__ ((warn_unused_result));
+int restart_dev_timer (const char * mountpoint)
+	__attribute__ ((warn_unused_result));
+int change_mount_device (const char * devname, const char * path)
+	__attribute__ ((warn_unused_result));
 
=== added directory 'util'
=== added file 'util/Makefile.am'
--- util/Makefile.am	1970-01-01 00:00:00 +0000
+++ util/Makefile.am	2011-07-15 11:51:33 +0000
@@ -0,0 +1,56 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CFLAGS = \
+	$(NIH_CFLAGS) \
+	$(NIH_DBUS_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+AM_CPPFLAGS = \
+	-DLOCALEDIR="\"$(localedir)\"" \
+	-DSBINDIR="\"$(sbindir)\"" \
+	-I$(top_builddir) -I$(top_srcdir) -iquote$(builddir) -iquote$(srcdir) \
+	-I$(top_srcdir)/intl
+
+sbin_PROGRAMS = \
+		mntctl
+
+mntctl_SOURCES = \
+		 mntctl.c mntctl.h
+
+nodist_mntctl_SOURCES = \
+	$(com_ubuntu_Mountall_Server_OUTPUTS) 
+mntctl_LDADD = \
+	$(LTLIBINTL) \
+	$(NIH_LIBS) \
+	$(NIH_DBUS_LIBS) \
+	$(DBUS_LIBS)
+
+com_ubuntu_Mountall_Server_OUTPUTS = \
+	com.ubuntu.Mountall.Server.c \
+	com.ubuntu.Mountall.Server.h
+
+com_ubuntu_Mountall_Server_XML = \
+	../dbus/com.ubuntu.Mountall.Server.xml
+
+$(com_ubuntu_Mountall_Server_OUTPUTS): $(com_ubuntu_Mountall_Server_XML)
+	$(AM_V_GEN)$(NIH_DBUS_TOOL) \
+		--package=$(PACKAGE) \
+		--mode=proxy --prefix=mountall_server \
+		--default-interface=com.ubuntu.Mountall0_1.Server \
+		--output=$@ $<
+
+# These have to be built sources because we can't compile object files
+# without the header file existing first
+BUILT_SOURCES = \
+	$(com_ubuntu_Mountall_Server_OUTPUTS) 
+
+CLEANFILES = \
+	$(com_ubuntu_Mountall_Server_OUTPUTS) 
+
+.PHONY: 
+
+clean-local:
+	rm -f *.gcno *.gcda
+
+maintainer-clean-local:
+	rm -f *.gcov
 
=== added file 'util/Makefile.in'
--- util/Makefile.in	1970-01-01 00:00:00 +0000
+++ util/Makefile.in	2011-07-15 11:51:33 +0000
@@ -0,0 +1,669 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+sbin_PROGRAMS = mntctl$(EXEEXT)
+subdir = util
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax.m4 \
+	$(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnih.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(sbindir)"
+PROGRAMS = $(sbin_PROGRAMS)
+am_mntctl_OBJECTS = mntctl.$(OBJEXT)
+am__objects_1 = com.ubuntu.Mountall.Server.$(OBJEXT)
+nodist_mntctl_OBJECTS = $(am__objects_1)
+mntctl_OBJECTS = $(am_mntctl_OBJECTS) $(nodist_mntctl_OBJECTS)
+am__DEPENDENCIES_1 =
+mntctl_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+DEFAULT_INCLUDES = 
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(mntctl_SOURCES) $(nodist_mntctl_SOURCES)
+DIST_SOURCES = $(mntctl_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBC = @LTLIBC@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NIH_CFLAGS = @NIH_CFLAGS@
+NIH_DBUS_CFLAGS = @NIH_DBUS_CFLAGS@
+NIH_DBUS_LIBS = @NIH_DBUS_LIBS@
+NIH_DBUS_TOOL = @NIH_DBUS_TOOL@
+NIH_LIBS = @NIH_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@
+PLYMOUTH_LIBS = @PLYMOUTH_LIBS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WINDRES = @WINDRES@
+WOE32 = @WOE32@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CFLAGS = \
+	$(NIH_CFLAGS) \
+	$(NIH_DBUS_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+AM_CPPFLAGS = \
+	-DLOCALEDIR="\"$(localedir)\"" \
+	-DSBINDIR="\"$(sbindir)\"" \
+	-I$(top_builddir) -I$(top_srcdir) -iquote$(builddir) -iquote$(srcdir) \
+	-I$(top_srcdir)/intl
+
+mntctl_SOURCES = \
+		 mntctl.c mntctl.h
+
+nodist_mntctl_SOURCES = \
+	$(com_ubuntu_Mountall_Server_OUTPUTS) 
+
+mntctl_LDADD = \
+	$(LTLIBINTL) \
+	$(NIH_LIBS) \
+	$(NIH_DBUS_LIBS) \
+	$(DBUS_LIBS)
+
+com_ubuntu_Mountall_Server_OUTPUTS = \
+	com.ubuntu.Mountall.Server.c \
+	com.ubuntu.Mountall.Server.h
+
+com_ubuntu_Mountall_Server_XML = \
+	../dbus/com.ubuntu.Mountall.Server.xml
+
+
+# These have to be built sources because we can't compile object files
+# without the header file existing first
+BUILT_SOURCES = \
+	$(com_ubuntu_Mountall_Server_OUTPUTS) 
+
+CLEANFILES = \
+	$(com_ubuntu_Mountall_Server_OUTPUTS) 
+
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign util/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign util/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
+	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-sbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+mntctl$(EXEEXT): $(mntctl_OBJECTS) $(mntctl_DEPENDENCIES) 
+	@rm -f mntctl$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(mntctl_OBJECTS) $(mntctl_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/com.ubuntu.Mountall.Server.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mntctl.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(sbindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local clean-sbinPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-sbinPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+	maintainer-clean-local
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-sbinPROGRAMS
+
+.MAKE: all check install install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-local clean-sbinPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-sbinPROGRAMS install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic maintainer-clean-local mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-sbinPROGRAMS
+
+
+$(com_ubuntu_Mountall_Server_OUTPUTS): $(com_ubuntu_Mountall_Server_XML)
+	$(AM_V_GEN)$(NIH_DBUS_TOOL) \
+		--package=$(PACKAGE) \
+		--mode=proxy --prefix=mountall_server \
+		--default-interface=com.ubuntu.Mountall0_1.Server \
+		--output=$@ $<
+
+.PHONY: 
+
+clean-local:
+	rm -f *.gcno *.gcda
+
+maintainer-clean-local:
+	rm -f *.gcov
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
 
=== added file 'util/mntctl.c'
--- util/mntctl.c	1970-01-01 00:00:00 +0000
+++ util/mntctl.c	2011-07-15 11:51:33 +0000
@@ -0,0 +1,387 @@
+/* mountall
+ *
+ * Copyright © 2010 Canonical Ltd.
+ *
+ * This file is based on initctl.c in upstart whose 
+ * Author: Scott James Remnant <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+
+#include <dbus/dbus.h>
+
+#include <sys/types.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <unistd.h>
+#include <fnmatch.h>
+
+#include <nih/macros.h>
+#include <nih/alloc.h>
+#include <nih/string.h>
+#include <nih/main.h>
+#include <nih/option.h>
+#include <nih/command.h>
+#include <nih/logging.h>
+#include <nih/error.h>
+#include <nih/hash.h>
+#include <nih/tree.h>
+
+#include <nih-dbus/dbus_error.h>
+#include <nih-dbus/dbus_proxy.h>
+#include <nih-dbus/errors.h>
+#include <nih-dbus/dbus_connection.h>
+
+#include "dbus/mountall.h"
+
+#include "com.ubuntu.Mountall.Server.h"
+
+
+/* Prototypes for option and command functions */
+int stop_timer_action		(NihCommand *command, char * const *args);
+int restart_timer_action	(NihCommand *command, char * const *args);
+int change_mount_device_action  (NihCommand *command, char * const *args);
+
+/**
+ * dest_name:
+ *
+ * Name on the D-Bus system bus that the message should be sent to when
+ * system is TRUE.
+ **/
+char *dest_name = NULL;
+
+/**
+ * mountall_open:
+ * @parent: parent object for new proxy.
+ *
+ * Opens a connection to the init daemon and returns a proxy to the manager
+ * object.  If @dest_name is not NULL, a connection is instead opened to
+ * the system bus and the proxy linked to the well-known name given.
+ *
+ * Error messages are output to standard error.
+ *
+ * If @parent is not NULL, it should be a pointer to another object which
+ * will be used as a parent for the returned proxy.  When all parents
+ * of the returned proxy are freed, the returned proxy will also be
+ * freed.
+ *
+ * Returns: newly allocated D-Bus proxy or NULL on error.
+ **/
+NihDBusProxy *
+mountall_open (const void *parent)
+{
+	DBusError       dbus_error;
+	DBusConnection *connection;
+	NihDBusProxy *  mountall;
+	int uid = getuid ();
+
+	dbus_error_init (&dbus_error);
+	if (uid) {
+		nih_error ("Need to be root to execute this command ");
+		return NULL;
+	}	
+		
+	connection = dbus_connection_open (DBUS_ADDRESS_MNTALL, &dbus_error);
+	if (! connection) {
+		nih_error ("%s: %s", _("Unable to connect to mountall"),
+			   dbus_error.message);
+		dbus_error_free (&dbus_error);
+		return NULL;
+	}
+	dbus_error_free (&dbus_error);
+
+	mountall = nih_dbus_proxy_new (parent, connection,
+				      dest_name,
+				      DBUS_PATH_MNTALL,
+				      NULL, NULL);
+	if (! mountall) {
+		NihError *err;
+
+		err = nih_error_get ();
+		nih_error ("%s", err->message);
+		nih_free (err);
+
+		dbus_connection_unref (connection);
+		return NULL;
+	}
+	nih_debug("Proxy for Mountall0_1.Server created!");
+	mountall->auto_start = FALSE;
+
+	/* Drop initial reference now the proxy holds one */
+	dbus_connection_unref (connection);
+	return mountall;
+}
+
+/**
+ * stop_timer_action:
+ * @command: NihCommand invoked,
+ * @args: command-line arguments.
+ *
+ * This function is called for the "stop-timer" command.
+ *
+ * Returns: 1 on error and 0 on success.
+ **/
+int
+stop_timer_action (NihCommand *  command,
+		   char * const *args)
+{
+	nih_local NihDBusProxy *mountall = NULL;
+	NihError *              err;
+
+	nih_assert (command != NULL);
+	nih_assert (args != NULL);
+
+	if (!args[0]) {
+		fprintf (stderr, _("%s: missing device name \n"), program_name);
+		nih_main_suggest_help ();
+		return 1;
+	}
+	mountall = mountall_open (NULL);
+	if (! mountall)
+		return 1;
+	if (mountall_server_stop_timer_sync (NULL, mountall, args[0]))
+		goto error;
+	return 0;
+error:
+	err = nih_error_get ();
+	nih_error ("%s", err->message);
+	nih_free (err);
+	return 1;
+}
+
+/**
+ * restart_timer_action:
+ * @command: NihCommand invoked,
+ * @args: command-line arguments.
+ *
+ * This function is called for the "restart-timer" command.
+ *
+ * Returns: 1 on error and 0 on success.
+ **/
+int
+restart_timer_action (NihCommand *  command,
+		   char * const *args)
+{
+	nih_local NihDBusProxy *mountall = NULL;
+	NihError *              err;
+
+	nih_assert (command != NULL);
+	nih_assert (args != NULL);
+
+	if (!args[0]) {
+		fprintf (stderr, _("%s: missing device name \n"), program_name);
+		nih_main_suggest_help ();
+		return 1;
+	}
+	mountall = mountall_open (NULL);
+	if (! mountall)
+		return 1;
+	
+	if (mountall_server_restart_timer_sync (NULL, mountall, args[0]))
+		goto error;
+	return 0;
+error:
+	err = nih_error_get ();
+	nih_error ("%s", err->message);
+	nih_free (err);
+	return 1;
+}
+
+/**
+ * change_mount_dev_action:
+ * @command: NihCommand invoked,
+ * @args: command-line arguments.
+ *
+ * This function is called for the "change-mount" command.
+ *
+ * Returns: 1 on error and 0 on success.
+ **/
+int
+change_mount_dev_action (NihCommand *  command,
+		   char * const *args)
+{
+	nih_local NihDBusProxy *mountall = NULL;
+	NihError *              err;
+
+	nih_assert (command != NULL);
+	nih_assert (args != NULL);
+
+	if (!args[0]) {
+		fprintf (stderr, _("%s: missing device name \n"), program_name);
+		nih_main_suggest_help ();
+		return 1;
+	}
+	if (!args[1]) {
+		fprintf (stderr, _("%s: missing mount point \n"), program_name);
+		nih_main_suggest_help ();
+		return 1;
+	}
+	mountall = mountall_open (NULL);
+	if (! mountall)
+		return 1;
+	if (mountall_server_change_mount_device_sync (NULL, mountall, 
+						args[0], args[1])) 
+		goto error;
+	return 0;
+error:
+	err = nih_error_get ();
+	nih_error ("%s", err->message);
+	nih_free (err);
+	return 1;
+}
+
+/**
+ * version_action:
+ * @command: NihCommand invoked,
+ * @args: command-line arguments.
+ *
+ * This function is called for the "version" command.
+ *
+ * Returns: command exit status.
+ **/
+int
+version_action (NihCommand *  command,
+		char * const *args)
+{
+	nih_local NihDBusProxy *mountall = NULL;
+	nih_local char *        version = NULL;
+	NihError *              err;
+
+	nih_assert (command != NULL);
+	nih_assert (args != NULL);
+
+	mountall = mountall_open (NULL);
+	if (! mountall)
+		return 1;
+
+	if (mountall_server_get_version_sync (NULL, mountall, &version) < 0)
+		goto error;
+
+	nih_message ("%s", version);
+
+	return 0;
+
+error:
+	err = nih_error_get ();
+	nih_error ("%s", err->message);
+	nih_free (err);
+
+	return 1;
+}
+
+#ifndef TEST
+/**
+ * options:
+ *
+ * Command-line options accepted for all arguments.
+ **/
+static NihOption options[] = {
+	NIH_OPTION_LAST
+};
+
+
+NihOption stop_timer_options[] = {
+	NIH_OPTION_LAST
+};
+
+NihOption restart_timer_options[] = {
+	NIH_OPTION_LAST
+};
+
+NihOption change_mnt_dev_options[] = {
+	NIH_OPTION_LAST
+};
+
+/**
+ * version_options:
+ *
+ * Command-line options accepted for the version command.
+ **/
+NihOption version_options[] = {
+	NIH_OPTION_LAST
+};
+
+/**
+ * timer_group:
+ *
+ * Group of commands related to the timer
+ **/
+static NihCommandGroup timer_commands = { N_("Timer") };
+
+/**
+ * mounts_group:
+ *
+ * Group of commands related to mount devices and paths.
+ **/
+static NihCommandGroup mount_commands = { N_("Mounts") };
+
+
+/**
+ * commands:
+ *
+ * Commands accepts as the first non-option argument, or program name.
+ **/
+static NihCommand commands[] = {
+	{ "stop-timer", N_("MOUNTPOINT"),
+	  N_("Stop a timer associated with the specified device"),
+	  N_("MOUNTPOINT is the mountpoint corresponding to a device whose "
+	     "timer you want to stop"),
+	  &timer_commands, stop_timer_options, stop_timer_action },
+
+	{ "restart-timer", N_("MOUNTPOINT"),
+	  N_("Restart a timer associated with the specified device"),
+	  N_("MOUNTPOINT is the mountpoint corresponding to a device that "
+	     "should become ready withing the default wait time or the time "
+	     "specified explicitly as a command line argument to mountall") ,
+	  &timer_commands, restart_timer_options, restart_timer_action },
+
+	{ "change-mount", N_("DEVICE-NAME PATH"),
+	  N_("Change the device to mount at a given mountpoint specified in "
+	     "/etc/fstab" ),
+	  N_("DEVICE-NAME is the name of the new device that you want to mount "
+	     "PATH is the full path specified in /etc/fstab") ,
+	  &mount_commands, change_mnt_dev_options, change_mount_dev_action },
+
+	{ "version", NULL,
+	  N_("Request the version of the mountall daemon."),
+	  NULL,
+	  NULL, version_options, version_action },
+
+	NIH_COMMAND_LAST
+};
+
+int
+main (int   argc,
+      char *argv[])
+{
+	int ret;
+
+	nih_main_init (argv[0]);
+
+	ret = nih_command_parser (NULL, argc, argv, options, commands);
+	if (ret < 0)
+		exit (1);
+
+	dbus_shutdown ();
+
+	return ret;
+}
+#endif