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.

configure

 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for mountall 2.23.
+# Generated by GNU Autoconf 2.67 for mountall 2.26.
 #
 # Report bugs to <ubuntu-devel@lists.ubuntu.com>.
 #
@@ -703,8 +703,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mountall'
 PACKAGE_TARNAME='mountall'
-PACKAGE_VERSION='2.23'
-PACKAGE_STRING='mountall 2.23'
+PACKAGE_VERSION='2.26'
+PACKAGE_STRING='mountall 2.26'
 PACKAGE_BUGREPORT='ubuntu-devel@lists.ubuntu.com'
 PACKAGE_URL=''
@@ -1511,7 +1511,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mountall 2.23 to adapt to many kinds of systems.
+\`configure' configures mountall 2.26 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1581,7 +1581,7 @@ fi
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mountall 2.23:";;
+     short | recursive ) echo "Configuration of mountall 2.26:";;
    esac
   cat <<\_ACEOF
@@ -1725,7 +1725,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mountall configure 2.23
+mountall configure 2.26
 generated by GNU Autoconf 2.67
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2328,7 +2328,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-It was created by mountall $as_me 2.23, which was
+It was created by mountall $as_me 2.26, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
   $ $0 $@
@@ -4476,7 +4476,7 @@ fi
 # Define the identity of the package.
  PACKAGE='mountall'
- VERSION='2.23'
+ VERSION='2.26'
 cat >>confdefs.h <<_ACEOF
@@ -18075,7 +18075,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mountall $as_me 2.23, which was
+This file was extended by mountall $as_me 2.26, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
   CONFIG_FILES    = $CONFIG_FILES
@@ -18141,7 +18141,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mountall config.status 2.23
+mountall config.status 2.26
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"

configure.ac

 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.62)
-AC_INIT([mountall], [2.23], [ubuntu-devel@lists.ubuntu.com])
+AC_INIT([mountall], [2.26], [ubuntu-devel@lists.ubuntu.com])
 AC_COPYRIGHT([[Copyright © 2010 Canonical Ltd.]])
 AC_CONFIG_SRCDIR([src/mountall.c])
 AC_CONFIG_MACRO_DIR([m4])

debian/changelog

+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 <surbhi.palande@canonical.com>  Wed, 13 Apr 2011 12:59:22 +0300
+
 mountall (2.25) natty; urgency=low
 
   * src/mountall.c: ignore ureadahead's potential mount of

ltmain.sh

@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu2
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,7 +73,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu2"
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
 TIMESTAMP=""
 package_revision=1.3017
 

src/mountall.c

@@ -1647,9 +1647,9 @@ void activate_timer()
 			|| (! 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 @@ main (int   argc,
 
 	/* 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);
 	}