Removing bootsplash support since it hasn't been in a kernel we've supported for...
[genkernel.git] / gen_initrd.sh
index d3b94feb162b0361e878f104441403c5dcafcf0c..005f5da204876deb418e5e540350d6b296aedd91 100644 (file)
@@ -8,25 +8,29 @@ create_initrd_loop() {
                gen_die 'Could not create loopback mount directory!'
        dd if=/dev/zero of=${TMPDIR}/initrd-${KV} bs=1k count=${1} >> "${DEBUGFILE}" 2>&1 ||
                gen_die "Could not zero initrd-${KV}"
-       mke2fs -F -N500 -q "${TMPDIR}/initrd-${KV}" >> "${DEBUGFILE}" 2>&1 ||
+       mke2fs -F -N750 -q "${TMPDIR}/initrd-${KV}" >> "${DEBUGFILE}" 2>&1 ||
                gen_die "Could not format initrd-${KV}!"
        mount -t ext2 -o loop "${TMPDIR}/initrd-${KV}" "${TEMP}/initrd-mount" >> "${DEBUGFILE}" 2>&1 ||
                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
 }
 
+# check for static linked file with objdump
+is_static() {
+       LANG="C" LC_ALL="C" objdump -T $1 2>&1 | grep "not a dynamic object" > /dev/null
+       return $?
+}
+
 create_base_initrd_sys() {
        rm -rf "${TEMP}/initrd-temp" > /dev/null
        mkdir -p ${TEMP}/initrd-temp/dev
@@ -42,7 +46,7 @@ create_base_initrd_sys() {
        ln -s ../bin ${TEMP}/initrd-temp/usr/bin
        ln -s ../bin ${TEMP}/initrd-temp/usr/sbin
 
-       echo "/dev/ram0     /           ext2    defaults" > ${TEMP}/initrd-temp/etc/fstab
+       echo "/dev/ram0     /           ext2    defaults        0 0" > ${TEMP}/initrd-temp/etc/fstab
        echo "proc          /proc       proc    defaults    0 0" >> ${TEMP}/initrd-temp/etc/fstab
 
        if [ "${NODEVFSD}" = '' ]
@@ -55,7 +59,7 @@ create_base_initrd_sys() {
 
        # SGI LiveCDs need the following binary (no better place for it than here)
        # getdvhoff is a DEPEND of genkernel, so it *should* exist
-       if [ "${MIPS_EMBEDDED_IMAGE}" != '' ]
+       if [ ${BUILD_INITRAMFS} -eq 1 ]
        then
                [ -e /usr/lib/getdvhoff/getdvhoff ] \
                        && cp /usr/lib/getdvhoff/getdvhoff ${TEMP}/initrd-temp/bin \
@@ -74,53 +78,20 @@ create_base_initrd_sys() {
                chmod +x "${TEMP}/initrd-temp/bin/blkid"
        fi
 
-       cp "${BUSYBOX_BINCACHE}" "${TEMP}/initrd-temp/bin/busybox.bz2" ||
+       cp "${BUSYBOX_BINCACHE}" "${TEMP}/initrd-temp/bin/busybox.tar.bz2" ||
                gen_die 'Could not copy busybox from bincache!'
-       bunzip2 "${TEMP}/initrd-temp/bin/busybox.bz2" ||
-               gen_die 'Could not uncompress busybox!'
+       tar -xjf "${TEMP}/initrd-temp/bin/busybox.tar.bz2" -C "${TEMP}/initrd-temp/bin" busybox ||
+               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 [ "${UDEV}" != '1' ]
+       if [ "${DEVFS}" -eq '1' ]
        then
                cp "${DEVFSD_BINCACHE}" "${TEMP}/initrd-temp/bin/devfsd.bz2" || gen_die 'Could not copy devfsd executable from bincache!'
                bunzip2 "${TEMP}/initrd-temp/bin/devfsd.bz2" || gen_die 'Could not uncompress devfsd!'
                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
@@ -139,7 +110,6 @@ create_base_initrd_sys() {
                        gen_die "Could not extract unionfs tools binary cache!";
        fi
 
-
        # DMRAID 
        if [ "${DMRAID}" = '1' ]
        then
@@ -152,15 +122,11 @@ create_base_initrd_sys() {
        # LVM2
        if [ "${LVM2}" = '1' ]
        then
-               if [ -e '/sbin/lvm' ] && ldd /sbin/lvm|grep -q 'not a dynamic executable';
+               if [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable';
                then
                        print_info 1 'LVM2: Adding support (using local static binaries)...'
                        cp /sbin/lvm "${TEMP}/initrd-temp/bin/lvm" ||
                                gen_die 'Could not copy over lvm!'
-                       ln "${TEMP}/initrd-temp/bin/lvm" "${TEMP}/initrd-temp/bin/vgscan" ||
-                               gen_die 'Could not symlink lvm -> vgscan!'
-                       ln "${TEMP}/initrd-temp/bin/lvm" "${TEMP}/initrd-temp/bin/vgchange" ||
-                               gen_die 'Could not symlink lvm -> vgchange!'
                else
                        print_info 1 'LVM2: Adding support (compiling binaries)...'
                        compile_lvm2
@@ -169,11 +135,24 @@ create_base_initrd_sys() {
                                gen_die "Could not extract lvm2 binary cache!";
                        mv ${TEMP}/initrd-temp/bin/lvm.static ${TEMP}/initrd-temp/bin/lvm ||
                                gen_die 'LVM2 error: Could not move lvm.static to lvm!'
-                       for i in vgchange vgscan; do
-                               ln  ${TEMP}/initrd-temp/bin/lvm ${TEMP}/initrd-temp/bin/$i ||
-                                       gen_die "LVM2 error: Could not link ${i}!"
-                       done
-               fi      
+               fi
+               for i in vgchange vgscan; do
+                       ln  ${TEMP}/initrd-temp/bin/lvm ${TEMP}/initrd-temp/bin/$i ||
+                               gen_die "LVM2 error: Could not link ${i}!"
+               done
+               mkdir -p ${TEMP}/initrd-temp/etc/lvm
+               if [ -x /sbin/lvm ]
+               then
+#                      lvm dumpconfig 2>&1 > /dev/null || gen_die 'Could not copy over lvm.conf!'
+#                      ret=$?
+#                      if [ ${ret} != 0 ]
+#                      then
+                               cp /etc/lvm/lvm.conf "${TEMP}/initrd-temp/etc/lvm/" ||
+                                       gen_die 'Could not copy over lvm.conf!'
+#                      else
+#                              gen_die 'Could not copy over lvm.conf!'
+#                      fi
+               fi
        fi
        
        # EVMS2
@@ -185,16 +164,32 @@ create_base_initrd_sys() {
                        mkdir -p ${TEMP}/initrd-temp/lib
                        mkdir -p ${TEMP}/initrd-temp/sbin
                        mkdir -p ${TEMP}/initrd-temp/etc
-                       cp -a /lib/ld-* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-                       cp -a /lib/libc-* /lib/libc.* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-                       cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-                       cp -a /lib/libpthread* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-                       cp -a /lib/libuuid*so* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-                       cp -a /lib/libevms*so* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-                       cp -a /lib/evms "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!'
-                       cp -a /lib/evms/* "${TEMP}/initrd-temp/lib/evms" || gen_die 'Could not copy files for EVMS2!'
-                       cp -a /etc/evms.conf "${TEMP}/initrd-temp/etc" || gen_die 'Could not copy files for EVMS2!'
-                       cp /sbin/evms_activate "${TEMP}/initrd-temp/sbin/evms_activate" || gen_die 'Could not copy over evms_activate!'
+                       mkdir -p ${TEMP}/initrd-temp/bin
+                       cp -a /lib/ld-* "${TEMP}/initrd-temp/lib" \
+                               || gen_die 'Could not copy files for EVMS2!'
+                       if [ -n "`ls /lib/libgcc_s*`" ]
+                       then
+                               cp -a /lib/libgcc_s* "${TEMP}/initrd-temp/lib" \
+                                       || gen_die 'Could not copy files for EVMS2!'
+                       fi
+                       cp -a /lib/libc-* /lib/libc.* "${TEMP}/initrd-temp/lib" \
+                               || gen_die 'Could not copy files for EVMS2!'
+                       cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initrd-temp/lib" \
+                               || gen_die 'Could not copy files for EVMS2!'
+                       cp -a /lib/libpthread* "${TEMP}/initrd-temp/lib" \
+                               || gen_die 'Could not copy files for EVMS2!'
+                       cp -a /lib/libuuid*so* "${TEMP}/initrd-temp/lib" \
+                               || gen_die 'Could not copy files for EVMS2!'
+                       cp -a /lib/libevms*so* "${TEMP}/initrd-temp/lib" \
+                               || gen_die 'Could not copy files for EVMS2!'
+                       cp -a /lib/evms "${TEMP}/initrd-temp/lib" \
+                               || gen_die 'Could not copy files for EVMS2!'
+                       cp -a /lib/evms/* "${TEMP}/initrd-temp/lib/evms" \
+                               || gen_die 'Could not copy files for EVMS2!'
+                       cp -a /etc/evms.conf "${TEMP}/initrd-temp/etc" \
+                               || gen_die 'Could not copy files for EVMS2!'
+                       cp /sbin/evms_activate "${TEMP}/initrd-temp/sbin" \
+                               || gen_die 'Could not copy over evms_activate!'
                        # Fix EVMS2 complaining that it cant find the swap utilities.
                        # These are not required in the initrd
                        for swap_libs in "${TEMP}/initrd-temp/lib/evms/*/swap*.so"
@@ -205,17 +200,30 @@ create_base_initrd_sys() {
        fi      
 
        for i in '[' ash basename cat chroot clear cp dirname echo env false find \
-       grep gunzip gzip ln ls loadkmap losetup lsmod mkdir mknod more mount mv \
-       pivot_root ps awk pwd rm rmdir rmmod sed sh sleep tar test touch true umount uname \
-       xargs yes zcat chmod chown cut kill killall; do
+       grep gunzip gzip ln ls loadkmap losetup lsmod mdev mkdir mknod more mount \
+       mv pivot_root ps awk pwd rm rmdir rmmod sed sh sleep tar test touch true \
+       umount uname xargs yes zcat chmod chown cut kill killall; do
                rm -f ${TEMP}/initrd-temp/bin/$i > /dev/null
                ln  ${TEMP}/initrd-temp/bin/busybox ${TEMP}/initrd-temp/bin/$i ||
                        gen_die "Busybox error: could not link ${i}!"
        done
+
+       if isTrue ${LUKS}
+       then
+               if is_static /bin/cryptsetup
+               then
+                       print_info 1 "Including LUKS support"
+                       rm -f ${TEMP}/initrd-temp/sbin/cryptsetup
+                       cp /bin/cryptsetup ${TEMP}/initrd-temp/sbin/cryptsetup
+                       chmod +x "${TEMP}/initrd-temp/sbin/cryptsetup"
+               else
+                       print_info 1 "LUKS support requires static cryptsetup at /bin/cryptsetup"
+                       print_info 1 "Not including LUKS support"
+               fi
+       fi
 }
 
-print_list()
-{
+print_list() {
        local x
        for x in ${*}
        do
@@ -278,6 +286,9 @@ create_initrd_aux() {
                fi
        fi
 
+       # Make sure it's executable
+       chmod 0755 "${TEMP}/initrd-temp/linuxrc"
+
        if [ -f "${GK_SHARE}/${ARCH}/initrd.scripts" ]
        then
                cp "${GK_SHARE}/${ARCH}/initrd.scripts" "${TEMP}/initrd-temp/etc/initrd.scripts"
@@ -311,9 +322,9 @@ create_initrd_aux() {
        fi
        mkdir -p "${TEMP}/initrd-temp/lib/keymaps"
        /bin/tar -C "${TEMP}/initrd-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz"
-       if isTrue $CMD_BLADECENTER
+       if isTrue $CMD_SLOWUSB
        then
-               echo 'MY_HWOPTS="${MY_HWOPTS} bladecenter"' >> ${TEMP}/initrd-temp/etc/initrd.defaults
+               echo 'MY_HWOPTS="${MY_HWOPTS} slowusb"' >> ${TEMP}/initrd-temp/etc/initrd.defaults
        fi
 
        cd ${TEMP}/initrd-temp/sbin && ln -s ../linuxrc init
@@ -349,7 +360,7 @@ create_initrd() {
        create_initrd_aux
 
        INITRD_CALC_SIZE=`calc_initrd_size`
-       INITRD_SIZE=`expr ${INITRD_CALC_SIZE} + 100`
+       INITRD_SIZE=`expr ${INITRD_CALC_SIZE} + 250`
        print_info 1 "        :: Size is at ${INITRD_SIZE}K"
        print_info 1 "        >> Creating loopback filesystem..."
        create_initrd_loop ${INITRD_SIZE}
@@ -366,41 +377,20 @@ 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
-               cp ${TMPDIR}/initrd-${KV} /boot/initrd-${KNAME}-${ARCH}-${KV} ||
-                       gen_die 'Could not copy the initrd to /boot!'
+               copy_image_with_preserve "initrd" \
+                       "${TMPDIR}/initrd-${KV}" \
+                       "initrd-${KNAME}-${ARCH}-${KV}"
        fi
 
        # Pegasos hack for merging the initrd into the kernel at compile time
        [ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] ||
                [ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] &&
-               cp ${TMPDIR}/initrd-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz
+               cp ${TMPDIR}/initrd-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz &&
                rm ${TMPDIR}/initrd-${KV}
 
        # Mips also mimics Pegasos to merge the initrd into the kernel
-       [ "${MIPS_EMBEDDED_IMAGE}" != '' ] \
+       [ ${BUILD_INITRAMFS} -eq 1 ] \
                && cp ${TMPDIR}/initrd-${KV} ${KERNEL_DIR}/mips/ramdisk/initrd.img.gz
 }