Merge lp:~csurbhi/ubuntu/natty/mountall/mountall-error.fix into lp:ubuntu/natty/mountall

[Surbhi Palande]

This change fixes two errors that I encountered while code browsing/testing.
1) find_mount("/") returns NULL when / is not found, so cannot access root->mounted (as root is NULL in this case)
2) In activate_timer(): the information message about the dev_wait_timeout should be printed after
    dev_wait_timeout is initialized properly.

Please consider merging this for natty.

[lp:~csurbhi/ubuntu/natty/mountall/mountall-error.fix]

359. 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.

[Marc Deslauriers (mdeslaur)]

Looks like this already got merged, so setting status to "merged".

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-19 16:46:02 +0000
+++ debian/changelog	2011-04-13 11:41:28 +0000
@@ -1,3 +1,12 @@
+mountall (2.25ubuntu1) natty; urgency=low
+
+  * 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.
+
+ -- Surbhi Palande <[e-mail]>  Wed, 13 Apr 2011 12:59:22 +0300
+
 mountall (2.25) natty; urgency=low
 
   * src/mountall.c: ignore ureadahead's potential mount of

=== modified file 'src/mountall.c'
--- src/mountall.c	2011-03-19 16:46:02 +0000
+++ src/mountall.c	2011-04-13 11:41:28 +0000
@@ -1647,9 +1647,9 @@
 			|| (! strncmp (mnt->device, "UUID=", 5))
 			|| (! strncmp (mnt->device, "LABEL=", 6))))
 		{
-			nih_message(_("Shall wait for device: %s for %d seconds, starting timer"), MOUNT_NAME (mnt), 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);
 			device_ready_timer = NIH_MUST (nih_timer_add_timeout (NULL, 
 						dev_wait_time, is_device_ready, NULL));
 			break;
@@ -3473,7 +3473,7 @@
 
 	/* Sanity check, the root filesystem should be already mounted */
 	root = find_mount ("/");
-	if (! root->mounted) {
+	if (! root || ! root->mounted ) {
 		nih_fatal ("%s", _("root filesystem isn't mounted"));
 		exit (EXIT_ERROR);
 	}