[Initng-svn] r2709 - in initng: initfiles/system src

[svn at initng.thinktux.net]

Author: jimmy
Date: Wed Jan  4 16:06:03 2006
New Revision: 2709

Modified:
   initng/initfiles/system/hostname.ii
   initng/initfiles/system/initial.ii
   initng/src/initng_fd.c
Log:
Fix timeout in initial, to verbose warning from initng_fd.c and typo in hostname.i


Modified: initng/initfiles/system/hostname.ii
==============================================================================
--- initng/initfiles/system/hostname.ii	(original)
+++ initng/initfiles/system/hostname.ii	Wed Jan  4 16:06:03 2006
@@ -15,7 +15,8 @@
 		# isn't setup, then we shouldn't go reseting the configuration #38172.
 		if [ -n "${myhost}" -a "${myhost}" != "(none)" ]
 		then
-		elsif [ -f /etc/hostname ]
+		    
+		else if [ -f /etc/hostname ]
 		then
 			myhost="`@cat@ /etc/hostname`"
 		else

Modified: initng/initfiles/system/initial.ii
==============================================================================
--- initng/initfiles/system/initial.ii	(original)
+++ initng/initfiles/system/initial.ii	Wed Jan  4 16:06:03 2006
@@ -77,7 +77,7 @@
 		# create all dev files.
 		if [ -x "@/sbin/udevsynthesize@" ]
 		then
-			udevd_timeout=30
+			udevd_timeout=60
 			echo "Running @/sbin/udevsynthesize@ to populate /dev ..."
 			@mkdir@ -p /dev/.udev/db/
 			@mkdir@ -p /dev/.udev/queue/
@@ -87,15 +87,10 @@
 			
 			# wait for the udevd childs to finish
 			echo "Waiting for /dev to be fully populated ..."
-			while [ -d /dev/.udev/queue/ ]
+			while [[ -d /dev/.udev/queue/ && "${udevd_timeout}" -ne 0 ]]
 			do
 				sleep 0.2
 				udevd_timeout=`@expr@ ${udevd_timeout} - 1`
-				if [ "${udevd_timeout}" -eq 0 ]
-				then
-					echo "Timeout!"
-					#exit 1
-				fi
 			done
 		elif [ -x "@/sbin/udevplug@" ]
 		then

Modified: initng/src/initng_fd.c
==============================================================================
--- initng/src/initng_fd.c	(original)
+++ initng/src/initng_fd.c	Wed Jan  4 16:06:03 2006
@@ -79,8 +79,12 @@
         D_("Calling pipewatcher plugin.\n");
         if ((*current->c.pipewatcher) (service, process) == TRUE)
             delivered = TRUE;
+#ifdef DEBUG
         else
-            W_("plugin %s returned FALSE\n", current->from_file);
+	{
+            D_("plugin %s returned FALSE\n", current->from_file);
+	}
+#endif
     }
 
     /* make sure someone handleded this */