Author: glen
Date: Thu Feb 3 12:16:29 2011
New Revision: 12113
Modified:
geninitrd/trunk/geninitrd
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-nfs.sh
geninitrd/trunk/mod-suspend.sh
geninitrd/trunk/mod-tuxonice.sh
geninitrd/trunk/mod-udev.sh
Log:
Simplify main code by moving state checks to modules itself
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Thu Feb 3 12:16:29 2011
@@ -1280,54 +1280,27 @@
find_modules_uvesafb
initrd_gen_uvesafb
-if is_yes "$have_luks"; then
- initrd_gen_luks
-fi
-
-if is_yes "$have_dmraid"; then
- initrd_gen_dmraid
-fi
-
-if is_yes "$have_multipath"; then
- initrd_gen_multipath
-fi
-
-if is_yes "$USE_BLKID"; then
- initrd_gen_blkid
-fi
+initrd_gen_luks
+initrd_gen_dmraid
+initrd_gen_multipath
+initrd_gen_blkid
if is_yes "$have_nfs"; then
initrd_gen_nfs
-else
- if is_yes "$have_md"; then
- initrd_gen_md
- fi
-
- if is_yes "$have_lvm"; then
- initrd_gen_lvm
- fi
-
- if is_yes "$have_luks"; then
- initrd_gen_luks
- fi
-
+else
+ initrd_gen_md
+ initrd_gen_lvm
+ initrd_gen_luks
initrd_gen_setrootdev
fi
-if is_yes "$USE_TUXONICE"; then
- initrd_gen_tuxonice
-fi
-
-if is_yes "$USE_SUSPEND"; then
- initrd_gen_suspend
-fi
+initrd_gen_tuxonice
+initrd_gen_suspend
# additional devs always needed
[ ! -e "$DESTDIR/$rootdev_add" ] && inst $rootdev_add /dev
-if is_yes "$USE_UDEV"; then
- initrd_gen_stop_udevd
-fi
+initrd_gen_stop_udevd
if [ "$INITRDFS" = "initramfs" ]; then
initrd_gen_initramfs_switchroot
@@ -1335,13 +1308,8 @@
umount_all
fi
-if is_yes "$FB_SPLASH"; then
- initrd_gen_fbsplash
-fi
-
-if is_yes "$FB_CON_DECOR"; then
- initrd_gen_fbcondecor
-fi
+initrd_gen_fbsplash
+initrd_gen_fbcondecor
IMAGE=$(mktemp -t initrd.img-XXXXXX) || die "mktemp failed"
@@ -1407,9 +1375,7 @@
fi
# XXX. check if bootsplash can output data to tmp dir not directly to
initramfs image.
-if is_yes "$BOOT_SPLASH"; then
- initrd_gen_bootsplash "$target"
-fi
+initrd_gen_bootsplash "$target"
rm -rf "$DESTDIR" "$IMAGE"
Modified: geninitrd/trunk/mod-blkid.sh
==============================================================================
--- geninitrd/trunk/mod-blkid.sh (original)
+++ geninitrd/trunk/mod-blkid.sh Thu Feb 3 12:16:29 2011
@@ -18,6 +18,9 @@
# generate initrd fragment
# @access public
initrd_gen_blkid() {
+ if ! is_yes "$USE_BLKID"; then
+ return
+ fi
debug "Adding BLKID support to initrd"
inst_exec $blkid /bin/blkid
Modified: geninitrd/trunk/mod-bootsplash.sh
==============================================================================
--- geninitrd/trunk/mod-bootsplash.sh (original)
+++ geninitrd/trunk/mod-bootsplash.sh Thu Feb 3 12:16:29 2011
@@ -22,6 +22,9 @@
# generate initrd fragment
# @access public
initrd_gen_bootsplash() {
+ if ! is_yes "$BOOT_SPLASH"; then
+ return
+ fi
local target="$1"
debug "Generating bootsplash"
Modified: geninitrd/trunk/mod-condecor.sh
==============================================================================
--- geninitrd/trunk/mod-condecor.sh (original)
+++ geninitrd/trunk/mod-condecor.sh Thu Feb 3 12:16:29 2011
@@ -22,6 +22,9 @@
# generate initrd fragment
# @access public
initrd_gen_fbcondecor() {
+ if ! is_yes "$FB_CON_DECOR"; then
+ return
+ fi
debug "Generating fbcondecor"
if [ -r /etc/sysconfig/splash ]; then
Modified: geninitrd/trunk/mod-dmraid.sh
==============================================================================
--- geninitrd/trunk/mod-dmraid.sh (original)
+++ geninitrd/trunk/mod-dmraid.sh Thu Feb 3 12:16:29 2011
@@ -67,6 +67,10 @@
# generate initrd fragment for dmraid
# @access public
initrd_gen_dmraid() {
+ if ! is_yes "$have_dmraid"; then
+ return
+ fi
+
inst_d /sbin
inst_exec $dmraid /sbin/dmraid
Modified: geninitrd/trunk/mod-fbsplash.sh
==============================================================================
--- geninitrd/trunk/mod-fbsplash.sh (original)
+++ geninitrd/trunk/mod-fbsplash.sh Thu Feb 3 12:16:29 2011
@@ -38,6 +38,9 @@
# generate initrd fragment
# @access public
initrd_gen_fbsplash() {
+ if ! is_yes "$FB_SPLASH"; then
+ return
+ fi
debug "Generating fbsplash"
if [ -r /etc/sysconfig/fbsplash ]; then
Modified: geninitrd/trunk/mod-luks.sh
==============================================================================
--- geninitrd/trunk/mod-luks.sh (original)
+++ geninitrd/trunk/mod-luks.sh Thu Feb 3 12:16:29 2011
@@ -87,6 +87,10 @@
# generate initrd fragment for cryptsetup luks init
# @access public
initrd_gen_luks() {
+ if ! is_yes "$have_luks"; then
+ return
+ fi
+
inst_d /bin
inst_exec $cryptsetup /bin/cryptsetup
Modified: geninitrd/trunk/mod-lvm.sh
==============================================================================
--- geninitrd/trunk/mod-lvm.sh (original)
+++ geninitrd/trunk/mod-lvm.sh Thu Feb 3 12:16:29 2011
@@ -117,6 +117,10 @@
# generate initrd fragment for lvm
# @access public
initrd_gen_lvm() {
+ if ! is_yes "$have_lvm"; then
+ return
+ fi
+
debug "Adding LVM support to initrd"
inst_d /tmp /newroot
inst_exec $lvm /bin/lvm.static
Modified: geninitrd/trunk/mod-md.sh
==============================================================================
--- geninitrd/trunk/mod-md.sh (original)
+++ geninitrd/trunk/mod-md.sh Thu Feb 3 12:16:29 2011
@@ -133,6 +133,9 @@
# generate initrd fragment for md
# @access public
initrd_gen_md() {
+ if ! is_yes "$have_md"; then
+ return
+ fi
debug "Setting up mdadm..."
inst_exec $mdassemble /bin/mdassemble
Modified: geninitrd/trunk/mod-multipath.sh
==============================================================================
--- geninitrd/trunk/mod-multipath.sh (original)
+++ geninitrd/trunk/mod-multipath.sh Thu Feb 3 12:16:29 2011
@@ -104,6 +104,10 @@
# generate initrd fragment
# @access public
initrd_gen_multipath() {
+ if ! is_yes "$have_multipath"; then
+ return
+ fi
+
inst_d /sbin /lib/udev /etc/multipath
inst_exec /sbin/kpartx /sbin
inst_exec /sbin/multipath /sbin
Modified: geninitrd/trunk/mod-nfs.sh
==============================================================================
--- geninitrd/trunk/mod-nfs.sh (original)
+++ geninitrd/trunk/mod-nfs.sh Thu Feb 3 12:16:29 2011
@@ -49,6 +49,10 @@
# generate initrd fragment
# @access public
initrd_gen_nfs() {
+ if ! is_yes "$have_nfs"; then
+ return
+ fi
+
# use root=/dev/ram0 init=/linuxrc when starting kernel or you will
# have problems like init(XX) being child process of swapper(1).
debug "Adding rootfs on NFS support to initrd (dhcp)"
Modified: geninitrd/trunk/mod-suspend.sh
==============================================================================
--- geninitrd/trunk/mod-suspend.sh (original)
+++ geninitrd/trunk/mod-suspend.sh Thu Feb 3 12:16:29 2011
@@ -40,6 +40,10 @@
# generate initrd fragment
# @access public
initrd_gen_suspend() {
+ if ! is_yes "$USE_SUSPEND"; then
+ return
+ fi
+
debug "Setting up suspend..."
mknod $DESTDIR/dev/snapshot c 10 231
Modified: geninitrd/trunk/mod-tuxonice.sh
==============================================================================
--- geninitrd/trunk/mod-tuxonice.sh (original)
+++ geninitrd/trunk/mod-tuxonice.sh Thu Feb 3 12:16:29 2011
@@ -18,6 +18,9 @@
# generate initrd fragment
# @access public
initrd_gen_tuxonice() {
+ if ! is_yes "$USE_TUXONICE"; then
+ return
+ fi
mount_sys
add_linuxrc <<-'EOF'
resume=no
Modified: geninitrd/trunk/mod-udev.sh
==============================================================================
--- geninitrd/trunk/mod-udev.sh (original)
+++ geninitrd/trunk/mod-udev.sh Thu Feb 3 12:16:29 2011
@@ -44,6 +44,9 @@
}
initrd_gen_stop_udevd() {
+ if ! is_yes "$USE_UDEV"; then
+ return
+ fi
busybox_applet killall
add_linuxrc <<-'EOF'
killall udevd
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
