diff options
Diffstat (limited to 'helpers/lh_binary_grub')
| -rwxr-xr-x | helpers/lh_binary_grub | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub index b196ad1..1bcf4ab 100755 --- a/helpers/lh_binary_grub +++ b/helpers/lh_binary_grub @@ -60,6 +60,9 @@ Check_architecture amd64 i386 # Checking depends Check_package chroot/usr/sbin/grub grub +# Restoring cache +Restore_cache cache/packages_binary + # Installing depends Install_package @@ -185,8 +188,8 @@ DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`" DEFAULT_KERNEL="`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`" DEFAULT_INITRD="initrd.img-`echo ${DEFAULT_KERNEL} | sed -e 's/vmlinuz-//'`" -Grub_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" -Grub_live_entry "live (fail-safe mode)" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}" +Grub_live_entry "live" "`basename ${DESTDIR_LIVE}`/${DEFAULT_KERNEL}" "`basename ${DESTDIR_LIVE}`/${DEFAULT_INITRD}" +Grub_live_entry "live (fail-safe mode)" "`basename ${DESTDIR_LIVE}`/${DEFAULT_KERNEL}" "`basename ${DESTDIR_LIVE}`/${DEFAULT_INITRD}" "${FAILSAFE}" for KERNEL in chroot/boot/vmlinuz-* do @@ -234,19 +237,26 @@ fi # Copying templates mkdir -p binary/boot/grub -cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub +cp -r "${TEMPLATES}"/* binary/boot/grub -# Copying grub case ${LIVE_BINARY_IMAGES} in iso) - cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub + FILES="chroot/usr/lib/grub/*/stage2_eltorito" ;; tar|usb-hdd) - cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/e2fs_stage1_5 chroot/usr/lib/grub/*/stage2 binary/boot/grub + FILES="chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/e2fs_stage1_5 chroot/usr/lib/grub/*/stage2" ;; esac +if [ "${LIVE_CHROOT_BUILD}" = "disabled" ] +then + FILES="`echo ${FILES} | sed -e 's/chroot//g'`" +fi + +# Copying grub +cp ${FILES} binary/boot/grub + # Copying local configuration file if [ -f config/binary_grub/menu.lst ] then @@ -283,6 +293,9 @@ sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst sed -i -e 's/\ $//g' binary/boot/grub/menu.lst +# Saving cache +Save_cache cache/packages_binary + # Removing depends Remove_package |