A few short fixes: reduced compilation verbosity; bootsplash fix to use both

'bootsplash' and 'bootsplash.conf' rather than 'bootsplash' and also docache
support which should work on at least loopFSes for now.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@100 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/gen_compile.sh b/gen_compile.sh
index a5fa69313c98e86ff5c7ab57c5053b0c90a6dc6d..7966ac48ac27a854958c59fe900ba813683752c6 100644 (file)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -158,7 +158,6 @@ compile_generic() {
 }
 
 extract_dietlibc_bincache() {
-       print_info 1 "dietlibc: >> Extracting cache..."
        cd "${TEMP}"
        rm -rf "${TEMP}/diet" > /dev/null
        tar -jxpf "${DIETLIBC_BINCACHE}" || gen_die "Could not extract dietlibc bincache!"
@@ -252,8 +251,6 @@ compile_busybox() {
 
                cd "${TEMP}"
                rm -rf "${BUSYBOX_DIR}" > /dev/null
-       else
-               print_info 1 "busybox: Found cache at ${BUSYBOX_BINCACHE}"
        fi
 }
 
@@ -299,8 +296,6 @@ compile_modutils() {
 
                cd "${TEMP}"
                rm -rf "${MODULE_INIT_TOOLS_DIR}" > /dev/null
-       else
-               print_info 1 "modutils: Found cache at ${MODUTILS_BINCACHE}"
        fi
 }
 
@@ -344,8 +339,6 @@ compile_module_init_tools() {
 
                cd "${TEMP}"
                rm -rf "${MODULE_INIT_TOOLS_DIR}" > /dev/null
-       else
-               print_info 1 "module-init-tools: Found cache at ${MODULE_INIT_TOOLS_BINCACHE}"
        fi
 }
 
@@ -396,8 +389,6 @@ compile_devfsd() {
 
                cd "${TEMP}"
        #       rm -rf "${DEVFSD_DIR}" > /dev/null
-       else
-               print_info 1 "devfsd: Found cache at ${DEVFSD_BINCACHE} and ${DEVFSD_CONF_BINCACHE}..."
        fi
 }
 
@@ -440,7 +431,5 @@ compile_dietlibc() {
                cd "${TEMP}"
                rm -rf "${DIETLIBC_DIR}" > /dev/null
                rm -rf "${TEMP}/diet" > /dev/null
-       else
-               print_info 1 "dietlibc: Found cache at ${DIETLIBC_BINCACHE}"
        fi
 }

diff --git a/gen_initrd.sh b/gen_initrd.sh
index e7ddd3cb66bb4c7d6a581a1127f3a8832534602f..f47a2877f0139b7ce1c49a79b216c8aef93ff1e2 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -211,7 +211,8 @@ create_initrd() {
        then
                if [ -x /sbin/splash ]
                then
-                       [ -z "${BOOTSPLASH_THEME}" ] && source /etc/conf.d/bootsplash.conf
+                       [ -z "${BOOTSPLASH_THEME}" ] && [ -e /etc/conf.d/bootplash.conf ] && source /etc/conf.d/bootsplash.conf
+                       [ -z "${BOOTSPLASH_THEME}" ] && [ -e /etc/conf.d/bootplash ] && source /etc/conf.d/bootsplash
                        [ -z "${BOOTSPLASH_THEME}" ] && BOOTSPLASH_THEME=default
                        print_info 1 "        >> Installing bootsplash [ using the ${BOOTSPLASH_THEME} theme ]..."
                        for bootRes in '800x600' '1024x768' '1280x1024' '1600x1200'

diff --git a/generic/initrd.defaults b/generic/initrd.defaults
index f7c0862980c96428fb9c542559219f777e4e69de..a2dfff9e5dcde26fef713e3785153c47c574768a 100644 (file)
--- a/generic/initrd.defaults
+++ b/generic/initrd.defaults
@@ -13,7 +13,7 @@ KMAJOR=`echo $KV | cut -f1 -d.`
 KMINOR=`echo $KV | cut -f2 -d.`
 KVER="${KMAJOR}.${KMINOR}"
 MISCOPTS="cdcache idebug detect"
-HWOPTS="scsi firewire ataraid pcmcia usb keymap"
+HWOPTS="scsi firewire ataraid pcmcia usb keymap cache"
 MY_HWOPTS="usb firewire"
 QUIET=1
 ROOT_LINKS="bin sbin lib lib64 boot usr opt"

diff --git a/generic/linuxrc b/generic/linuxrc
index d9db937fdb34742a6284c6e5a7e702e00fc50cd0..2648005abd528faf32f476aec65960c3f6db574d 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -230,15 +230,31 @@ then
                fi
        fi
 
+       if [ "${LOOPTYPE}" != "noloop" ]
+       then
+           check_loop
+           if [ "${DO_cache}" ]
+           then
+               echo "${GOOD}>>${NORMAL}${BOLD} Copying loop file for caching...${NORMAL}"
+               cp /newroot/mnt/cdrom/${LOOP} /newroot/mnt/${LOOP}
+               if [ $? -ne 0 ]
+               then
+                       echo "${BAD}!!${NORMAL}${BOLD} Failed to cache the loop file! Lack of space?"
+                       rm /newroot/mnt/livecd.* 2>/dev/null
+                       rm /newroot/mnt/zisofs 2>/dev/null
+               else
+                       LOOPEXT="../"
+               fi
+           fi
+       fi
+
        if [ "${LOOPTYPE}" = "normal" ]
        then
-               check_loop
-               
                # bind-mount /dev/ so that loop devices can be found
                mount -o bind /newroot/dev /dev
 
                echo -e "${GOOD}>>${NORMAL}${BOLD} Mounting loop filesystem...${NORMAL}"
-               mount -t ext2 -o loop,ro /newroot/mnt/cdrom/${LOOP} /newroot/mnt/livecd
+               mount -t ext2 -o loop,ro /newroot/mnt/cdrom/${LOOPEXT}${LOOP} /newroot/mnt/livecd
                if [ "$?" != "0" ]
                then
                        echo "FAILED TO MOUNT LOOP FILESYSTEM, barfing out to shell"
@@ -248,10 +264,9 @@ then
                umount /dev
        elif [ "${LOOPTYPE}" = "squashfs" ]
        then
-               check_loop
                mount -o bind /newroot/dev /dev
                echo -e "${GOOD}>>${NORMAL}${BOLD} Mounting squashfs filesystem...${NORMAL}"
-               mount -t squashfs -o loop,ro /newroot/mnt/cdrom/${LOOP} /newroot/mnt/livecd
+               mount -t squashfs -o loop,ro /newroot/mnt/cdrom/${LOOPEXT}${LOOP} /newroot/mnt/livecd
                if [ "$?" != "0" ]
                then
                        echo "FAILED TO MOUNT LOOP FILESYSTEM, barfing out to shell"
@@ -261,10 +276,9 @@ then
                umount /dev
        elif [ "${LOOPTYPE}" = "gcloop" ]
        then
-               check_loop
                echo -e "${GOOD}>>${NORMAL}${BOLD} Mounting gcloop filesystem...${NORMAL}"
                mount -o bind /newroot/dev /dev
-               echo " " | losetup -E 19 -e ucl-0 -p0 /newroot/dev/loop0 /newroot/mnt/cdrom/${LOOP}
+               echo " " | losetup -E 19 -e ucl-0 -p0 /newroot/dev/loop0 /newroot/mnt/cdrom/${LOOPEXT}${LOOP}
                if [ "$?" != "0" ]
                then
                        echo "FAILED TO losetup THE LOOP DEVICE"
@@ -275,8 +289,7 @@ then
                umount /dev
        elif [ "${LOOPTYPE}" = "zisofs" ]
        then
-               check_loop
-               FS_LOCATION="mnt/cdrom/${LOOP}"
+               FS_LOCATION="mnt/cdrom/${LOOPEXT}${LOOP}"
        elif [ "${LOOPTYPE}" = "noloop" ]
        then
                FS_LOCATION="mnt/cdrom"