Author: glen
Date: Mon Apr 27 11:43:00 2009
New Revision: 10337
Modified:
geninitrd/trunk/mod-blkid.sh
geninitrd/trunk/mod-bootsplash.sh
geninitrd/trunk/mod-condecor.sh
geninitrd/trunk/mod-dmraid.sh
geninitrd/trunk/mod-fbsplash.sh
geninitrd/trunk/mod-luks.sh
geninitrd/trunk/mod-lvm.sh
geninitrd/trunk/mod-md.sh
geninitrd/trunk/mod-multipath.sh
geninitrd/trunk/mod-suspend.sh
geninitrd/trunk/mod-tuxonice.sh
geninitrd/trunk/mod-udev.sh
geninitrd/trunk/mod-uvesafb.sh
Log:
- allow configuration for USE_xxx from sysconfig/geninitrd. lp#364812
Modified: geninitrd/trunk/mod-blkid.sh
==============================================================================
--- geninitrd/trunk/mod-blkid.sh (original)
+++ geninitrd/trunk/mod-blkid.sh Mon Apr 27 11:43:00 2009
@@ -1,17 +1,16 @@
#!/bin/sh
#
# geninitrd mod: blkid
+USE_BLKID=${USE_BLKID:-yes}
# true if we should parse UUID= or LABEL= for root parameter
-have_blkid=no
# setup geninitrd module
# @access public
setup_mod_blkid() {
blkid=$(find_tool $initrd_dir/blkid /sbin/initrd-blkid)
- if [ -x "$blkid" ]; then
- USE_BLKID=yes
- else
+
+ if [ ! -x "$blkid" ]; then
USE_BLKID=no
fi
}
Modified: geninitrd/trunk/mod-bootsplash.sh
==============================================================================
--- geninitrd/trunk/mod-bootsplash.sh (original)
+++ geninitrd/trunk/mod-bootsplash.sh Mon Apr 27 11:43:00 2009
@@ -1,9 +1,9 @@
#!/bin/sh
#
# geninitrd mod: bootsplash
+BOOT_SPLASH=${BOOT_SPLASH:-no}
# requires bootsplash package to operate
-BOOT_SPLASH=no
# setup geninitrd module
# @access public
Modified: geninitrd/trunk/mod-condecor.sh
==============================================================================
--- geninitrd/trunk/mod-condecor.sh (original)
+++ geninitrd/trunk/mod-condecor.sh Mon Apr 27 11:43:00 2009
@@ -1,9 +1,9 @@
#!/bin/sh
#
# geninitrd mod: condecor
+FB_CON_DECOR=${FB_CON_DECOR:-no}
# requires splashutils package to operate
-FB_CON_DECOR=no
# setup geninitrd module
# @access public
Modified: geninitrd/trunk/mod-dmraid.sh
==============================================================================
--- geninitrd/trunk/mod-dmraid.sh (original)
+++ geninitrd/trunk/mod-dmraid.sh Mon Apr 27 11:43:00 2009
@@ -1,6 +1,7 @@
#!/bin/sh
#
# geninitrd mod: dmraid
+USE_DMRAID=${USE_DMRAID:-yes}
# if we should init dmraid at boot
have_dmraid=no
@@ -9,9 +10,7 @@
# @access public
setup_mod_dmraid() {
dmraid=$(find_tool $initrd_dir/dmraid /sbin/dmraid-initrd)
- if [ -x /sbin/dmraid -a -x "$dmraid" ]; then
- USE_DMRAID=yes
- else
+ if [ ! -x /sbin/dmraid ] || [ ! -x "$dmraid" ]; then
USE_DMRAID=no
fi
Modified: geninitrd/trunk/mod-fbsplash.sh
==============================================================================
--- geninitrd/trunk/mod-fbsplash.sh (original)
+++ geninitrd/trunk/mod-fbsplash.sh Mon Apr 27 11:43:00 2009
@@ -1,9 +1,9 @@
#!/bin/sh
#
# geninitrd mod: fbsplash
+FB_SPLASH=${FB_SPLASH:-no}
# requires splashutils package to operate
-FB_SPLASH=no
# setup geninitrd module
# @access public
Modified: geninitrd/trunk/mod-luks.sh
==============================================================================
--- geninitrd/trunk/mod-luks.sh (original)
+++ geninitrd/trunk/mod-luks.sh Mon Apr 27 11:43:00 2009
@@ -1,6 +1,7 @@
#!/bin/sh
#
# geninitrd mod: cryptsetup luks
+USE_LUKS=${USE_LUKS:-yes}
# true if root device is crypted with cryptsetup luks
# and we should init cryptsetup luks at boot
@@ -13,9 +14,8 @@
# @access public
setup_mod_luks() {
cryptsetup=$(find_tool $initrd_dir/cryptsetup /sbin/cryptsetup-initrd)
- if [ -x /sbin/cryptsetup -a -x "$cryptsetup" ]; then
- USE_LUKS=yes
- else
+
+ if [ ! -x /sbin/cryptsetup ] || [ ! -x "$cryptsetup" ]; then
USE_LUKS=no
fi
}
Modified: geninitrd/trunk/mod-lvm.sh
==============================================================================
--- geninitrd/trunk/mod-lvm.sh (original)
+++ geninitrd/trunk/mod-lvm.sh Mon Apr 27 11:43:00 2009
@@ -1,6 +1,7 @@
#!/bin/sh
#
# geninitrd mod: LVM
+USE_LVM=${USE_LVM:-yes}
# if we should init LVM at boot
have_lvm=no
@@ -27,17 +28,16 @@
# @access public
setup_mod_lvm() {
lvm=$(find_tool $initrd_dir/lvm /sbin/initrd-lvm)
- if [ -x /sbin/lvm -a -x "$lvm" ]; then
- USE_LVM=yes
+ if [ ! -x /sbin/lvm ] || [ ! -x "$lvm" ]; then
+ USE_LVM=no
+ fi
+
+ if is_yes "$USE_LVM" && [ -z "$LVMTOOLSVERSION" ]; then
+ LVMTOOLSVERSION=$(LC_ALL=C $lvm vgchange --version 2>/dev/null
| awk '/LVM version:/{if ($3 >= 2) print "2"}')
if [ -z "$LVMTOOLSVERSION" ]; then
- LVMTOOLSVERSION=$(LC_ALL=C $lvm vgchange --version
2>/dev/null | awk '/LVM version:/{if ($3 >= 2) print "2"}')
- if [ -z "$LVMTOOLSVERSION" ]; then
- die "Can't determine LVM tools version. Please
set LVMTOOLSVERSION and rerun $PROGRAM."
- fi
+ die "Can't determine LVM tools version. Please set
LVMTOOLSVERSION and rerun $PROGRAM."
fi
- else
- USE_LVM=no
fi
}
Modified: geninitrd/trunk/mod-md.sh
==============================================================================
--- geninitrd/trunk/mod-md.sh (original)
+++ geninitrd/trunk/mod-md.sh Mon Apr 27 11:43:00 2009
@@ -1,6 +1,7 @@
#!/bin/sh
#
# geninitrd mod: mdadm
+USE_MD=${USE_MD:-yes}
# if we should init md (softraid) at boot
have_md=no
@@ -9,9 +10,7 @@
# @access public
setup_mod_md() {
mdassemble=$(find_tool $initrd_dir/mdassemble /sbin/initrd-mdassemble)
- if [ -x /sbin/mdadm -a -x "$mdassemble" ]; then
- USE_MD=yes
- else
+ if [ ! -x /sbin/mdadm ] || [ ! -x "$mdassemble" ]; then
USE_MD=no
fi
}
Modified: geninitrd/trunk/mod-multipath.sh
==============================================================================
--- geninitrd/trunk/mod-multipath.sh (original)
+++ geninitrd/trunk/mod-multipath.sh Mon Apr 27 11:43:00 2009
@@ -1,6 +1,7 @@
#!/bin/sh
#
# geninitrd mod: dm-multipath
+USE_MULTIPATH=${USE_MULTIPATH:-yes}
# if we should init dm-multipath at boot
have_multipath=no
@@ -11,9 +12,7 @@
# setup geninitrd module
# @access public
setup_mod_multipath() {
- if [ -x /sbin/multipath ]; then
- USE_MULTIPATH=yes
- else
+ if [ ! -x /sbin/multipath ]; then
USE_MULTIPATH=no
fi
}
Modified: geninitrd/trunk/mod-suspend.sh
==============================================================================
--- geninitrd/trunk/mod-suspend.sh (original)
+++ geninitrd/trunk/mod-suspend.sh Mon Apr 27 11:43:00 2009
@@ -1,13 +1,11 @@
#!/bin/sh
#
# geninitrd mod: suspend
-
-USE_SUSPEND=yes
+USE_SUSPEND=${USE_SUSPEND:-yes}
# resume device
resume_dev=""
-#
# setup geninitrd module
# @access public
setup_mod_suspend() {
@@ -18,9 +16,7 @@
resume=$(find_tool $initrd_dir/resume /usr/${_lib}/suspend/resume
/usr/sbin/resume)
- if [ -x "$resume" -a -f /etc/suspend.conf ]; then
- USE_SUSPEND=yes
- else
+ if [ ! -x "$resume" ] || [ ! -f /etc/suspend.conf ]; then
USE_SUSPEND=no
fi
}
Modified: geninitrd/trunk/mod-tuxonice.sh
==============================================================================
--- geninitrd/trunk/mod-tuxonice.sh (original)
+++ geninitrd/trunk/mod-tuxonice.sh Mon Apr 27 11:43:00 2009
@@ -1,8 +1,7 @@
#!/bin/sh
#
# geninitrd mod: tuxonice
-
-USE_TUXONICE=no
+USE_TUXONICE=${USE_TUXONICE:-no}
#
# setup geninitrd module
Modified: geninitrd/trunk/mod-udev.sh
==============================================================================
--- geninitrd/trunk/mod-udev.sh (original)
+++ geninitrd/trunk/mod-udev.sh Mon Apr 27 11:43:00 2009
@@ -1,6 +1,7 @@
#!/bin/sh
#
# geninitrd mod: udev
+USE_UDEV=${USE_UDEV:-yes}
#
# TODO:
@@ -13,12 +14,13 @@
udevd=$(find_tool $initrd_dir/udevd /sbin/initrd-udevd)
udevadm=$(find_tool $initrd_dir/udevadm /sbin/initrd-udevadm)
- if [ "$kernel_version" -ge "002006" -a -x "$udevd" -a -x "$udevadm" -a
-f /etc/udev/udev.conf ]; then
- USE_UDEV=yes
- . /etc/udev/udev.conf
- else
+ if [ "$kernel_version" -lt "002006" ] || [ ! -x "$udevd" -o ! -x
"$udevadm" -o ! -f /etc/udev/udev.conf ]; then
USE_UDEV=no
fi
+
+ if is_yes "$USE_UDEV"; then
+ . /etc/udev/udev.conf
+ fi
}
# generate initrd fragment
Modified: geninitrd/trunk/mod-uvesafb.sh
==============================================================================
--- geninitrd/trunk/mod-uvesafb.sh (original)
+++ geninitrd/trunk/mod-uvesafb.sh Mon Apr 27 11:43:00 2009
@@ -1,6 +1,7 @@
#!/bin/sh
#
# geninitrd mod: uvesafb
+USE_V86D=${USE_V86D:-yes}
# whether v86d should be installed
need_uvesafb=no
@@ -9,9 +10,8 @@
# @access public
setup_mod_uvesafb() {
v86d=$(find_tool $initrd_dir/v86d /sbin/v86d)
- if [ -x "$v86d" ]; then
- USE_V86D=yes
- else
+
+ if [ ! -x "$v86d" ]; then
USE_V86D=no
fi
}
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
