[projects/geninitrd] drop rcsid stuff; not functional with git
glen
glen at pld-linux.org
Thu Dec 26 15:55:53 CET 2013
commit b7114ddeb173f7f165af83ca3f9dc95e66a60ec6
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Dec 26 16:55:18 2013 +0200
drop rcsid stuff; not functional with git
geninitrd | 17 +++++++----------
mod-blkid.sh | 2 --
mod-bootsplash.sh | 2 --
mod-condecor.sh | 2 --
mod-dmraid.sh | 2 --
mod-fbsplash.sh | 2 --
mod-ide.sh | 2 --
mod-luks.sh | 2 --
mod-lvm.sh | 2 --
mod-md.sh | 2 --
mod-multipath.sh | 2 --
mod-nfs.sh | 2 --
mod-sata.sh | 2 --
mod-scsi.sh | 2 --
mod-suspend.sh | 2 --
mod-tuxonice.sh | 2 --
mod-udev.sh | 2 --
mod-usbkbd.sh | 2 --
mod-uvesafb.sh | 2 --
19 files changed, 7 insertions(+), 46 deletions(-)
---
diff --git a/geninitrd b/geninitrd
index c26cbcc..71b2d51 100755
--- a/geninitrd
+++ b/geninitrd
@@ -7,8 +7,7 @@
# based on mkinitrd from RedHat Linux
#
-GENINITRD_RCSID='$Revision$ $Date:: $'
-R=${GENINITRD_RCSID#* *}; VERSION=${R%% *}
+VERSION='devel'
PROGRAM=${0##*/}
. /etc/rc.d/init.d/functions
@@ -136,11 +135,10 @@ geninitrd_load_mods() {
# setup geninitrd modules
geninitrd_setup_mods() {
- local mod rcsid
+ local mod
for mod in $GENINITRD_MODS; do
- eval rcsid=$(echo \$$mod | LC_ALL=C tr '[a-z]' '[A-Z]')_RCSID
- debug "# $rcsid (mod-$mod)"
+ debug "# $mod"
# some mods want init
if type setup_mod_$mod > /dev/null; then
@@ -821,7 +819,7 @@ initrd_gen_devices() {
initrd_gen_setrootdev() {
verbose "Adding rootfs finding based on kernel cmdline root= option support."
busybox_applet ls
- debug "Current /proc/partitions:\n$(sed -e 's,^,> ,' /proc/partitions)"
+ debug "Current /proc/partitions:\n$(sed -e 's,^,| ,' /proc/partitions)"
add_linuxrc <<-'EOF'
if [ "${ROOT##/dev/}" != "${ROOT}" ]; then
rootnr="$(busybox awk -v rootnode="${ROOT##/dev/}" '$4 == rootnode { print 256 * $1 + $2 }' /proc/partitions)"
@@ -1281,7 +1279,7 @@ initrd_dir=/usr/$_lib/initrd
kernel_version=$(echo "$kernel" | awk -F. '{gsub(/[_-].*/, "", $0); print sprintf("%03d%03d",$1,$2)}')
kernel_version_long=$(echo "$kernel" | awk -F. '{gsub(/[_-].*/, "", $0); print sprintf("%03d%03d%03d",$1,$2,$3)}')
-verbose "# $GENINITRD_RCSID (geninitrd)"
+verbose "# geninitrd $VERSION"
debug "Using _lib: $_lib"
debug "Using initrd_dir: $initrd_dir"
@@ -1433,9 +1431,8 @@ ln -s busybox $DESTDIR/bin/initrd-busybox
add_linuxrc <<EOF
#!/bin/sh
-# initrd generated
+# initrd generated by geninitrd/$VERSION
# on $(LC_ALL=C date)
-# by $GENINITRD_RCSID
EOF
mount_proc
@@ -1590,7 +1587,7 @@ fi
initrd_gen_fbsplash
initrd_gen_fbcondecor
-debug "Current /linuxrc:\n$(sed -e 's,^,> ,' $DESTDIR/linuxrc)"
+debug "Current /linuxrc:\n$(sed -e 's,^,| ,' $DESTDIR/linuxrc)"
IMAGE=$(mktemp -t initrd.img-XXXXXX) || die "mktemp failed"
diff --git a/mod-blkid.sh b/mod-blkid.sh
index 2d67974..8ee2a48 100644
--- a/mod-blkid.sh
+++ b/mod-blkid.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-BLKID_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: blkid
USE_BLKID=${USE_BLKID:-yes}
diff --git a/mod-bootsplash.sh b/mod-bootsplash.sh
index 338d749..98f9591 100644
--- a/mod-bootsplash.sh
+++ b/mod-bootsplash.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-BOOTSPLASH_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: bootsplash
BOOT_SPLASH=${BOOT_SPLASH:-no}
diff --git a/mod-condecor.sh b/mod-condecor.sh
index dc0cca1..ca8ae0a 100644
--- a/mod-condecor.sh
+++ b/mod-condecor.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-CONDECOR_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: condecor
FB_CON_DECOR=${FB_CON_DECOR:-no}
diff --git a/mod-dmraid.sh b/mod-dmraid.sh
index 853e958..2663a5b 100644
--- a/mod-dmraid.sh
+++ b/mod-dmraid.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-DMRAID_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: dmraid
USE_DMRAID=${USE_DMRAID:-yes}
diff --git a/mod-fbsplash.sh b/mod-fbsplash.sh
index 8cd162f..20083be 100644
--- a/mod-fbsplash.sh
+++ b/mod-fbsplash.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-FBSPLASH_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: fbsplash
FB_SPLASH=${FB_SPLASH:-no}
diff --git a/mod-ide.sh b/mod-ide.sh
index d3ab2f9..6742a58 100644
--- a/mod-ide.sh
+++ b/mod-ide.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-IDE_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: ide
PREIDEMODS="-ide-core unknown -ide-detect -ide-disk -ide-gd_mod"
diff --git a/mod-luks.sh b/mod-luks.sh
index 8cee34f..268b635 100644
--- a/mod-luks.sh
+++ b/mod-luks.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-LUKS_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: cryptsetup luks
USE_LUKS=${USE_LUKS:-yes}
diff --git a/mod-lvm.sh b/mod-lvm.sh
index 72a2e71..a0bdf80 100644
--- a/mod-lvm.sh
+++ b/mod-lvm.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-LVM_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: LVM
USE_LVM=${USE_LVM:-yes}
diff --git a/mod-md.sh b/mod-md.sh
index 7599387..3e63afc 100644
--- a/mod-md.sh
+++ b/mod-md.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-MD_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: mdadm
USE_MD=${USE_MD:-yes}
diff --git a/mod-multipath.sh b/mod-multipath.sh
index 926e6ae..f918dd5 100644
--- a/mod-multipath.sh
+++ b/mod-multipath.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-MULTIPATH_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: dm-multipath
USE_MULTIPATH=${USE_MULTIPATH:-yes}
diff --git a/mod-nfs.sh b/mod-nfs.sh
index 4fddd99..8158ece 100644
--- a/mod-nfs.sh
+++ b/mod-nfs.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-NFS_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: nfs
# if we should init NFS at boot
diff --git a/mod-sata.sh b/mod-sata.sh
index 7cbff99..cf8af5f 100644
--- a/mod-sata.sh
+++ b/mod-sata.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-SATA_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: sata
find_modules_sata() {
diff --git a/mod-scsi.sh b/mod-scsi.sh
index 3f216e6..12724ef 100644
--- a/mod-scsi.sh
+++ b/mod-scsi.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-SCSI_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: scsi
# it should be safe to remove scsi_mod from here, but I'm not sure...
diff --git a/mod-suspend.sh b/mod-suspend.sh
index 58ca390..48efd57 100644
--- a/mod-suspend.sh
+++ b/mod-suspend.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-SUSPEND_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: suspend
USE_SUSPEND=${USE_SUSPEND:-yes}
diff --git a/mod-tuxonice.sh b/mod-tuxonice.sh
index f8d9d80..9783411 100644
--- a/mod-tuxonice.sh
+++ b/mod-tuxonice.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-TUXONICE_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: tuxonice
USE_TUXONICE=${USE_TUXONICE:-no}
diff --git a/mod-udev.sh b/mod-udev.sh
index e370d62..dbb7c53 100644
--- a/mod-udev.sh
+++ b/mod-udev.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-UDEV_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: udev
USE_UDEV=${USE_UDEV:-yes}
diff --git a/mod-usbkbd.sh b/mod-usbkbd.sh
index 932a583..0dd0d20 100644
--- a/mod-usbkbd.sh
+++ b/mod-usbkbd.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-USBKBD_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: usbkbd
find_modules_usbkbd() {
diff --git a/mod-uvesafb.sh b/mod-uvesafb.sh
index 0b855d0..df67948 100644
--- a/mod-uvesafb.sh
+++ b/mod-uvesafb.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-UVESAFB_RCSID='$Revision$ $Date:: $'
-
# geninitrd mod: uvesafb
USE_V86D=${USE_V86D:-yes}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/geninitrd.git/commitdiff/b7114ddeb173f7f165af83ca3f9dc95e66a60ec6
More information about the pld-cvs-commit
mailing list