SVN: geninitrd/trunk: geninitrd mod-blkid.sh mod-bootsplash.sh mod-condecor.sh mod-depmod24.sh mod-d...

glen glen at pld-linux.org
Sat Feb 19 14:59:41 CET 2011


Author: glen
Date: Sat Feb 19 14:59:40 2011
New Revision: 12169

Modified:
   geninitrd/trunk/geninitrd
   geninitrd/trunk/mod-blkid.sh
   geninitrd/trunk/mod-bootsplash.sh
   geninitrd/trunk/mod-condecor.sh
   geninitrd/trunk/mod-depmod24.sh
   geninitrd/trunk/mod-dmraid.sh
   geninitrd/trunk/mod-fbsplash.sh
   geninitrd/trunk/mod-ide.sh
   geninitrd/trunk/mod-luks.sh
   geninitrd/trunk/mod-lvm.sh
   geninitrd/trunk/mod-md.sh
   geninitrd/trunk/mod-multipath.sh
   geninitrd/trunk/mod-nfs.sh
   geninitrd/trunk/mod-sata.sh
   geninitrd/trunk/mod-scsi.sh
   geninitrd/trunk/mod-suspend.sh
   geninitrd/trunk/mod-tuxonice.sh
   geninitrd/trunk/mod-udev.sh
   geninitrd/trunk/mod-uvesafb.sh
Log:
each module their own rcsid var

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Sat Feb 19 14:59:40 2011
@@ -111,21 +111,23 @@
 			die "$mod geninitrd module can't be loaded"
 		fi
 		. /lib/geninitrd/mod-$mod.sh
-		debug "# $RCSID (mod-$mod)"
 
-		if type setup_mod_$mod > /dev/null; then
-			# add to list which need init
-			GENINITRD_MODS="$GENINITRD_MODS $mod"
-		fi
+		GENINITRD_MODS="$GENINITRD_MODS $mod"
 	done
 }
 
 # setup geninitrd modules
 geninitrd_setup_mods() {
-	local mod
+	local mod rcsid
 
 	for mod in $GENINITRD_MODS; do
-		eval setup_mod_$mod
+		eval rcsid=$(echo \$$mod | LC_ALL=C tr '[a-z]' '[A-Z]')_RCSID
+		debug "# $rcsid (mod-$mod)"
+
+		# some mods want init
+		if type setup_mod_$mod > /dev/null; then
+			eval setup_mod_$mod
+		fi
 	done
 }
 

Modified: geninitrd/trunk/mod-blkid.sh
==============================================================================
--- geninitrd/trunk/mod-blkid.sh	(original)
+++ geninitrd/trunk/mod-blkid.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+BLKID_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: blkid
 USE_BLKID=${USE_BLKID:-yes}

Modified: geninitrd/trunk/mod-bootsplash.sh
==============================================================================
--- geninitrd/trunk/mod-bootsplash.sh	(original)
+++ geninitrd/trunk/mod-bootsplash.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+BOOTSPLASH_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: bootsplash
 BOOT_SPLASH=${BOOT_SPLASH:-no}

Modified: geninitrd/trunk/mod-condecor.sh
==============================================================================
--- geninitrd/trunk/mod-condecor.sh	(original)
+++ geninitrd/trunk/mod-condecor.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+CONDECOR_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: condecor
 FB_CON_DECOR=${FB_CON_DECOR:-no}

Modified: geninitrd/trunk/mod-depmod24.sh
==============================================================================
--- geninitrd/trunk/mod-depmod24.sh	(original)
+++ geninitrd/trunk/mod-depmod24.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+DEPMOD24_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: depmod for 2.4 kernel
 

Modified: geninitrd/trunk/mod-dmraid.sh
==============================================================================
--- geninitrd/trunk/mod-dmraid.sh	(original)
+++ geninitrd/trunk/mod-dmraid.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+DMRAID_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: dmraid
 USE_DMRAID=${USE_DMRAID:-yes}

Modified: geninitrd/trunk/mod-fbsplash.sh
==============================================================================
--- geninitrd/trunk/mod-fbsplash.sh	(original)
+++ geninitrd/trunk/mod-fbsplash.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+FBSPLASH_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: fbsplash
 FB_SPLASH=${FB_SPLASH:-no}

Modified: geninitrd/trunk/mod-ide.sh
==============================================================================
--- geninitrd/trunk/mod-ide.sh	(original)
+++ geninitrd/trunk/mod-ide.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+IDE_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: ide
 

Modified: geninitrd/trunk/mod-luks.sh
==============================================================================
--- geninitrd/trunk/mod-luks.sh	(original)
+++ geninitrd/trunk/mod-luks.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+LUKS_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: cryptsetup luks
 USE_LUKS=${USE_LUKS:-yes}

Modified: geninitrd/trunk/mod-lvm.sh
==============================================================================
--- geninitrd/trunk/mod-lvm.sh	(original)
+++ geninitrd/trunk/mod-lvm.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+LVM_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: LVM
 USE_LVM=${USE_LVM:-yes}

Modified: geninitrd/trunk/mod-md.sh
==============================================================================
--- geninitrd/trunk/mod-md.sh	(original)
+++ geninitrd/trunk/mod-md.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+MD_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: mdadm
 USE_MD=${USE_MD:-yes}

Modified: geninitrd/trunk/mod-multipath.sh
==============================================================================
--- geninitrd/trunk/mod-multipath.sh	(original)
+++ geninitrd/trunk/mod-multipath.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+MULTIPATH_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: dm-multipath
 USE_MULTIPATH=${USE_MULTIPATH:-yes}

Modified: geninitrd/trunk/mod-nfs.sh
==============================================================================
--- geninitrd/trunk/mod-nfs.sh	(original)
+++ geninitrd/trunk/mod-nfs.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+NFS_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: nfs
 

Modified: geninitrd/trunk/mod-sata.sh
==============================================================================
--- geninitrd/trunk/mod-sata.sh	(original)
+++ geninitrd/trunk/mod-sata.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+SATA_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: sata
 

Modified: geninitrd/trunk/mod-scsi.sh
==============================================================================
--- geninitrd/trunk/mod-scsi.sh	(original)
+++ geninitrd/trunk/mod-scsi.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+SCSI_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: scsi
 

Modified: geninitrd/trunk/mod-suspend.sh
==============================================================================
--- geninitrd/trunk/mod-suspend.sh	(original)
+++ geninitrd/trunk/mod-suspend.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+SUSPEND_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: suspend
 USE_SUSPEND=${USE_SUSPEND:-yes}

Modified: geninitrd/trunk/mod-tuxonice.sh
==============================================================================
--- geninitrd/trunk/mod-tuxonice.sh	(original)
+++ geninitrd/trunk/mod-tuxonice.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+TUXONICE_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: tuxonice
 USE_TUXONICE=${USE_TUXONICE:-no}

Modified: geninitrd/trunk/mod-udev.sh
==============================================================================
--- geninitrd/trunk/mod-udev.sh	(original)
+++ geninitrd/trunk/mod-udev.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+UDEV_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: udev
 USE_UDEV=${USE_UDEV:-yes}

Modified: geninitrd/trunk/mod-uvesafb.sh
==============================================================================
--- geninitrd/trunk/mod-uvesafb.sh	(original)
+++ geninitrd/trunk/mod-uvesafb.sh	Sat Feb 19 14:59:40 2011
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
+UVESAFB_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: uvesafb
 USE_V86D=${USE_V86D:-yes}


More information about the pld-cvs-commit mailing list