Author: arekm
Date: Sat Feb 19 08:54:20 2011
New Revision: 12161
Modified:
geninitrd/trunk/functions
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:
Report RCSID for loaded modules, too.
Modified: geninitrd/trunk/functions
==============================================================================
--- geninitrd/trunk/functions (original)
+++ geninitrd/trunk/functions Sat Feb 19 08:54:20 2011
@@ -165,3 +165,24 @@
local node="$1"
printf "/dev/mapper/%s" $(dm_name "$node")
}
+
+# checks option in /proc/cmdline
+# returns:
+# "$1-set" if option is set without any value
+# "value" if option has some value specified
+get_cmdline_string='get_cmdline() {
+ local opt="$1" cmdline
+ read cmdline < /proc/cmdline
+
+ for arg in $cmdline; do
+ if [ "${arg}" = "${opt}" ]; then
+ echo "${opt}-set"
+ return
+ fi
+ if [ "${arg##${opt}=}" != "${arg}" ]; then
+ echo "${arg##${opt}=}"
+ return
+ fi
+ done
+}'
+eval "$get_cmdline_string"
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Sat Feb 19 08:54:20 2011
@@ -124,6 +124,7 @@
local mod
for mod in $GENINITRD_MODS; do
+ debug "# mod-$mod: $RCSID"
eval setup_mod_$mod
done
}
Modified: geninitrd/trunk/mod-blkid.sh
==============================================================================
--- geninitrd/trunk/mod-blkid.sh (original)
+++ geninitrd/trunk/mod-blkid.sh Sat Feb 19 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# 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 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# 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 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# 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 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# geninitrd mod: depmod for 2.4 kernel
# Finds module dependencies
Modified: geninitrd/trunk/mod-dmraid.sh
==============================================================================
--- geninitrd/trunk/mod-dmraid.sh (original)
+++ geninitrd/trunk/mod-dmraid.sh Sat Feb 19 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# 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 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# 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 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# geninitrd mod: ide
PREIDEMODS="-ide-core unknown -ide-detect -ide-disk -ide-gd_mod"
@@ -99,7 +100,7 @@
}'
/usr/share/pci-database/ide.pci`
[ -n "$module" ] &&
idemodules="$idemodules $module"
done
- if is_yes "$(awk '
/ide=reverse/ { print "yes" } ' /proc/cmdline)"; then
+ if [ "$(get_cmdline ide)" =
"reverse" ]; then
new_idemodules=""
for nc in idemodules; do
new_idemodules="$nc $new_idemodules"
Modified: geninitrd/trunk/mod-luks.sh
==============================================================================
--- geninitrd/trunk/mod-luks.sh (original)
+++ geninitrd/trunk/mod-luks.sh Sat Feb 19 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# 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 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# 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 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# 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 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# 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 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# geninitrd mod: nfs
# if we should init NFS at boot
Modified: geninitrd/trunk/mod-sata.sh
==============================================================================
--- geninitrd/trunk/mod-sata.sh (original)
+++ geninitrd/trunk/mod-sata.sh Sat Feb 19 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# geninitrd mod: sata
# setup geninitrd module
Modified: geninitrd/trunk/mod-scsi.sh
==============================================================================
--- geninitrd/trunk/mod-scsi.sh (original)
+++ geninitrd/trunk/mod-scsi.sh Sat Feb 19 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# geninitrd mod: scsi
# it should be safe to remove scsi_mod from here, but I'm not sure...
Modified: geninitrd/trunk/mod-suspend.sh
==============================================================================
--- geninitrd/trunk/mod-suspend.sh (original)
+++ geninitrd/trunk/mod-suspend.sh Sat Feb 19 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# 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 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# 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 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# 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 08:54:20 2011
@@ -1,5 +1,6 @@
#!/bin/sh
-#
+RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+
# geninitrd mod: uvesafb
USE_V86D=${USE_V86D:-yes}
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
