Author: glen
Date: Sat Apr 26 21:17:40 2008
New Revision: 9726
Modified:
geninitrd/trunk/geninitrd
Log:
- disable splashes early if initramfs is not used
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Sat Apr 26 21:17:40 2008
@@ -319,7 +319,7 @@
findmodule socal
fi
- local mod depmod
+ local mod depmod
if [ "$skiperrors" = 1 ]; then
depmod=$(find_depmod $modName silent)
else
@@ -1127,11 +1127,6 @@
debug "Generating bootsplash"
- if [ "$INITRDFS" != "initramfs" ]; then
- warn "Using bootsplash requires INITRDFS=initramfs; skipping
bootsplash generation"
- return
- fi
-
if [ ! -x /bin/splash.bin ]; then
warn "Failed to execute /bin/splash.bin. Is bootsplash package
installed?"
return
@@ -1165,11 +1160,6 @@
initrd_gen_fbsplash() {
debug "Generating fbsplash"
- if [ "$INITRDFS" != "initramfs" ]; then
- warn "Using fbsplash requires INITRDFS=initramfs; skipping
fbsplash generation"
- return
- fi
-
if [ ! -x /usr/bin/splash_geninitramfs -a ! -x
/usr/sbin/splash_geninitramfs ]; then
warn "Failed to find splash_geninitramfs. Is splashutils
package installed?"
return
@@ -1204,11 +1194,6 @@
initrd_gen_fbcondecor() {
debug "Generating fbcondecor"
- if [ "$INITRDFS" != "initramfs" ]; then
- warn "Using fbcondecor requires INITRDFS=initramfs; skipping
fbcondecor generation"
- return
- fi
-
if [ ! -x /usr/bin/splash_geninitramfs -a ! -x
/usr/sbin/splash_geninitramfs ]; then
warn "Failed to find splash_geninitramfs. Is splashutils
package installed?"
return
@@ -1484,7 +1469,7 @@
inst /sbin/initrd-blkid /bin/blkid
initrd_gen_devices
add_linuxrc <<-'EOF'
- # if built with blkid change ROOT=LABEL=something into
ROOT=/dev/somethingelse -
+ # if built with blkid change ROOT=LABEL=something into
ROOT=/dev/somethingelse -
# parsed by blkid
if [ "${ROOT##LABEL=}" != "${ROOT}" -o "${ROOT##UUID=}" !=
"${ROOT}" ]; then
ROOT="$(/bin/blkid -t $ROOT -o device -l)"
@@ -1778,6 +1763,21 @@
die "/lib/modules/$kernel is not a directory."
fi
+if [ "$INITRDFS" != "initramfs" ]; then
+ if is_yes "$BOOT_SPLASH"; then
+ warn "Using bootsplash requires INITRDFS=initramfs; skipping
bootsplash generation"
+ BOOT_SPLASH=no
+ fi
+ if is_yes "$FB_SPLASH"; then
+ warn "Using fbsplash requires INITRDFS=initramfs; skipping
fbsplash generation"
+ FB_SPLASH=no
+ fi
+ if is_yes "$FB_CON_DECOR"; then
+ warn "Using fbcondecor requires INITRDFS=initramfs; skipping
fbcondecor generation"
+ FB_CON_DECOR=no
+ fi
+fi
+
if is_yes "$USE_SUSPEND" && is_yes "$USE_TUXONICE"; then
warn "Tuxonice and mainline suspend are exclusive!"
fi
@@ -1978,7 +1978,7 @@
# Parsing root parameter
# We support passing root as hda3 /dev/hda3 0303 0x0303 and 303
add_linuxrc <<-'EOF'
- device=/dev/no_partition_found
+ device=/dev/no_partition_found
eval "$(busybox awk -v c="$ROOT" '
BEGIN {
num_pattern_short = "[0-9a-f][0-9a-f][0-9a-f]";
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
