Removing bootsplash support since it hasn't been in a kernel we've supported for...

[genkernel.git] / gen_initrd.sh

diff --git a/gen_initrd.sh b/gen_initrd.sh
index efa43ea88d6a2e7f58b1e0a5ca027654f0debff9..005f5da204876deb418e5e540350d6b296aedd91 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -14,15 +14,13 @@ create_initrd_loop() {
                gen_die 'Could not mount the initrd filesystem!'
 }
 
-create_initrd_unmount_loop()
-{
+create_initrd_unmount_loop() {
        cd ${TEMP}
        umount "${TEMP}/initrd-mount" ||
                gen_die 'Could not unmount initrd system!'
 }
 
-move_initrd_to_loop()
-{
+move_initrd_to_loop() {
        cd "${TEMP}/initrd-temp"
        mv * "${TEMP}/initrd-mount" >> ${DEBUGFILE} 2>&1
 }
@@ -86,23 +84,6 @@ create_base_initrd_sys() {
                gen_die 'Could not extract busybox bincache!'
        chmod +x "${TEMP}/initrd-temp/bin/busybox"
 
-       if [ "${NOINITRDMODULES}" = '' ]
-       then
-               if [ "${PAT}" -gt "4" ]
-               then
-                       cp "${MODULE_INIT_TOOLS_BINCACHE}" "${TEMP}/initrd-temp/bin/insmod.static.bz2" ||
-                               gen_die 'Could not copy insmod.static from bincache!'
-               else
-                       cp "${MODUTILS_BINCACHE}" "${TEMP}/initrd-temp/bin/insmod.static.bz2" ||
-                               gen_die 'Could not copy insmod.static from bincache'
-               fi
-
-               bunzip2 "${TEMP}/initrd-temp/bin/insmod.static.bz2" ||
-                       gen_die 'Could not uncompress insmod.static!'
-               mv "${TEMP}/initrd-temp/bin/insmod.static" "${TEMP}/initrd-temp/bin/insmod"
-               chmod +x "${TEMP}/initrd-temp/bin/insmod"
-       fi
-
        # devfsd
        if [ "${DEVFS}" -eq '1' ]
        then
@@ -111,21 +92,6 @@ create_base_initrd_sys() {
                chmod +x "${TEMP}/initrd-temp/bin/devfsd"
        fi
 
-       # udev
-#      if [ "${UDEV}" -eq '1' ]
-#      then
-#              /bin/tar -jxpf "${UDEV_BINCACHE}" -C "${TEMP}/initrd-temp" || gen_die 'Could not extract udev binary cache!'
-#              if [ ! -e "${TEMP}/initrd-temp/bin/udevstart" ]
-#              then
-#                  ln -sf "./udev" "${TEMP}/initrd-temp/bin/udevstart" || gen_die 'Could not symlink udev -> udevstart!'
-#              fi
-               
-#              if [ ! -e "${TEMP}/initrd-temp/bin/udevsend" ]
-#              then
-#                  ln -sf "./udev" "${TEMP}/initrd-temp/bin/udevsend" || gen_die 'Could not symlink udev -> udevsend!'
-#              fi
-#      fi
-       
        #unionfs modules
        if [ "${UNIONFS}" -eq '1' ]
        then
@@ -144,18 +110,6 @@ create_base_initrd_sys() {
                        gen_die "Could not extract unionfs tools binary cache!";
        fi
 
-       # Suspend
-       if [ "${SUSPEND}" = '1' ]
-       then
-               print_info 1 'SUSPEND: Adding support (compiling binaries)...'
-               compile_suspend
-               /bin/tar -jxpf "${SUSPEND_BINCACHE}" -C "${TEMP}/initrd-temp" ||
-                       gen_die "Could not extract suspend binary cache!"
-               mkdir -p "${TEMP}/initrd-temp/etc"
-               cp -f /etc/suspend.conf "${TEMP}/initrd-temp/etc" ||
-                       gen_die 'Could not copy /etc/suspend.conf'
-       fi
-
        # DMRAID 
        if [ "${DMRAID}" = '1' ]
        then
@@ -423,28 +377,6 @@ create_initrd() {
                mv ${TMPDIR}/initrd-${KV}.gz ${TMPDIR}/initrd-${KV}
        fi
 
-       if [ "${BOOTSPLASH}" -eq "1" ]
-       then
-               if [ -x /sbin/splash ]
-               then
-                       [ -z "${BOOTSPLASH_THEME}" ] && [ -e /etc/conf.d/bootsplash.conf ] && source /etc/conf.d/bootsplash.conf
-                       [ -z "${BOOTSPLASH_THEME}" ] && [ -e /etc/conf.d/bootsplash ] && 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'
-                       do
-                               if [ -f "/etc/bootsplash/${BOOTSPLASH_THEME}/config/bootsplash-${bootRes}.cfg" ]
-                               then
-                                       /sbin/splash -s -f /etc/bootsplash/${BOOTSPLASH_THEME}/config/bootsplash-${bootRes}.cfg >> ${TMPDIR}/initrd-${KV} ||
-                                               gen_die "Error: could not copy ${bootRes} bootsplash!"
-                               else
-                                       print_warning 1 "splash: Did not find a bootsplash for the ${bootRes} resolution..."
-                               fi
-                       done
-               else
-                       print_warning 1 '        >> No bootsplash detected; skipping!'
-               fi
-       fi
        if ! isTrue "${CMD_NOINSTALL}"
        then
                copy_image_with_preserve "initrd" \