SVN: geninitrd/trunk/geninitrd

blues blues at pld-linux.org
Thu Aug 7 08:58:24 CEST 2008


Author: blues
Date: Thu Aug  7 08:58:24 2008
New Revision: 9858

Modified:
   geninitrd/trunk/geninitrd
Log:
- don't duplicate "WARNING", use warn()


Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Thu Aug  7 08:58:24 2008
@@ -610,7 +610,7 @@
 						fi
 
 						if [ -z "$idemodules" ]; then
-							echo "WARNING: rootfs on IDE device but no related modules found, loading ide-generic."
+							warn "rootfs on IDE device but no related modules found, loading ide-generic."
 							idemodules="ide-generic"
 						fi
 
@@ -621,9 +621,9 @@
 					# }}}
 					# else tryauto {{{
 					else
-						[ -r /usr/share/pci-database/ide.pci ] || echo "WARNING: /usr/share/pci-database/ide.pci missing."
-						[ -r /proc/bus/pci/devices ] || echo "WARNING: /proc/bus/pci/devices missing."
-						echo "Automatic IDE modules finding not available."
+						[ -r /usr/share/pci-database/ide.pci ] || warn "/usr/share/pci-database/ide.pci missing."
+						[ -r /proc/bus/pci/devices ] || warn "/proc/bus/pci/devices missing."
+						warn "Automatic IDE modules finding not available."
 					fi
 					# }}}
 				fi
@@ -638,7 +638,7 @@
 is_lvm_node() {
 	local node="$1"
 	if [ ! -e "$node" ]; then
-		warn "WARNING: check_lvm(): node $node doesn't exist!"
+		warn "check_lvm(): node $node doesn't exist!"
 		return 1
 	fi
 
@@ -1880,7 +1880,7 @@
 fi
 
 if [ ! -f /proc/mounts ]; then
-	warn "WARNING: /proc filesystem not mounted, may cause wrong results or failure."
+	warn "/proc filesystem not mounted, may cause wrong results or failure."
 fi
 
 if [ -d /usr/lib64 ]; then


More information about the pld-cvs-commit mailing list