SVN: geninitrd/trunk/geninitrd
glen
glen at pld-linux.org
Fri Nov 2 18:58:18 CET 2007
Author: glen
Date: Fri Nov 2 18:58:17 2007
New Revision: 8971
Modified:
geninitrd/trunk/geninitrd
Log:
- avoid packing initramfs twice for fbsplash, now symlinks are preserved too
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Fri Nov 2 18:58:17 2007
@@ -1494,6 +1494,7 @@
initrd_gen_bootsplash() {
local target="$1"
+ debug "generating bootsplash"
if [ ! -x /bin/splash.bin ]; then
echo >&2 "Failed to execute /bin/splash.bin. Is bootsplash package installed?"
elif [ -z "$THEME" ]; then
@@ -1517,7 +1518,7 @@
}
initrd_gen_fbsplash() {
- local target="$1"
+ debug "generating fbsplash"
if [ ! -x /usr/bin/splash_geninitramfs ]; then
echo >&2 "Failed to execute /usr/bin/splash_geninitramfs. Is splashutils package installed?"
@@ -1528,7 +1529,7 @@
if [ -n "$FB_SPLASH_RESOLUTIONS" ]; then
for res in $FB_SPLASH_RESOLUTIONS; do
if [ -f "/etc/splash/$SPLASH_THEME/$res.cfg" ]; then
- /usr/bin/splash_geninitramfs -a $target -r $res $SPLASH_THEME && \
+ /usr/bin/splash_geninitramfs -c $MNTIMAGE -r $res $SPLASH_THEME && \
debug "Added $res $SPLASH_THEME theme to initramfs."
else
echo >&2 "/etc/splash/$SPLASH_THEME/$res.cfg doesn't exist, skipped"
@@ -1900,6 +1901,11 @@
umount_all
fi
+if is_yes "$FB_SPLASH"; then
+ initrd_gen_fbsplash
+fi
+
+
(cd "$MNTIMAGE"; tar cf - .) | (cd "$MNTPOINT"; tar xf -)
case "$INITRDFS" in
@@ -1949,10 +1955,6 @@
initrd_gen_bootsplash "$target"
fi
-if is_yes "$FB_SPLASH"; then
- initrd_gen_fbsplash "$target"
-fi
-
rm -rf "$MNTIMAGE" "$MNTPOINT" "$IMAGE"
# vim:ts=4:sw=4:noet:fdm=marker
More information about the pld-cvs-commit
mailing list