Author: glen
Date: Fri Apr 3 00:52:31 2009
New Revision: 10290
Modified:
geninitrd/trunk/Makefile
geninitrd/trunk/geninitrd
Log:
- condecor modularized
Modified: geninitrd/trunk/Makefile
==============================================================================
--- geninitrd/trunk/Makefile (original)
+++ geninitrd/trunk/Makefile Fri Apr 3 00:52:31 2009
@@ -1,6 +1,6 @@
# when making release, make sure you do it as RELEASE document describes
VERSION := 10000.3
-MODS := ide luks multipath dmraid lvm md blkid udev tuxonice suspend
fbsplash
+MODS := ide luks multipath dmraid lvm md blkid udev tuxonice suspend
fbsplash condecor
FILES_MODS := $(MODS:%=mod-%.sh)
FILES := Makefile geninitrd.sysconfig geninitrd functions
$(FILES_MODS) geninitrd.8 geninitrd.8.xml ChangeLog
prefix := /usr
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Fri Apr 3 00:52:31 2009
@@ -33,8 +33,6 @@
rootdev=""
# requires bootsplash package to operate
BOOT_SPLASH=no
-# requires splashutils package to operate
-FB_CON_DECOR=no
# internal variables
# is /dev on tmpfs
@@ -739,42 +737,6 @@
done
}
-initrd_gen_fbcondecor() {
- debug "Generating fbcondecor"
-
- if [ ! -x /usr/bin/splash_geninitramfs -a ! -x
/usr/sbin/splash_geninitramfs ]; then
- warn "Failed to find splash_geninitramfs. Is splashutils
package installed?"
- return
- fi
- splash_geninitramfs_bin=/usr/sbin/splash_geninitramfs
- [ -f /usr/bin/splash_geninitramfs ] &&
splash_geninitramfs_bin=/usr/bin/splash_geninitramfs
-
- if [ -r /etc/sysconfig/splash ]; then
- . /etc/sysconfig/splash
- fi
-
- if [ -z "$SPLASH_THEME" ]; then
- warn "Please configure your /etc/sysconfig/splash first."
- warn "Generating of splashes skipped."
- return
- fi
-
- if [ -z "$FB_SPLASH_RESOLUTIONS" ]; then
- warn "No FB_SPLASH_RESOLUTIONS specified in
/etc/sysconfig/splash."
- warn "Not adding fbcondecor to initramfs."
- return
- fi
-
- for res in $FB_SPLASH_RESOLUTIONS; do
- if [ -f "/etc/splash/$SPLASH_THEME/$res.cfg" ]; then
- $splash_geninitramfs_bin -c $DESTDIR -r $res
$SPLASH_THEME && \
- debug "Added $res $SPLASH_THEME theme to initramfs."
- else
- warn "/etc/splash/$SPLASH_THEME/$res.cfg doesn't exist,
skipped"
- fi
- done
-}
-
# Generates /dev nodes based on /proc/partitions information.
# Needs /proc mounted.
# Can be called multiple times.
@@ -951,7 +913,7 @@
. /etc/sysconfig/geninitrd
fi
-geninitrd_load_mods ide luks multipath dmraid lvm md blkid udev tuxonice
suspend
+geninitrd_load_mods ide luks multipath dmraid lvm md blkid udev tuxonice
suspend fbsplash condecor
while [ $# -gt 0 ]; do
case $1 in
@@ -1185,13 +1147,6 @@
modext=".ko"
fi
-if [ "$INITRDFS" != "initramfs" ]; then
- 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 "$FB_SPLASH" && is_yes "$BOOT_SPLASH"; then
warn "bootsplash and fbsplash are exclusive!"
fi
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
