root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

util-iso-boot: clean up grub code

Browse source
This commit is contained in:
udeved 2017-03-24 18:19:42 +01:00
parent 0010542bb4
commit e8ce4332bb
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/util-iso-boot.sh
View file

@ -52,44 +52,42 @@ vars_to_boot_conf(){
} }
prepare_grub(){ prepare_grub(){
local src=i386-pc app='core.img' grub=$2/boot/grub efi=$2/efi/boot \ local platform=i386-pc img='core.img' grub=$2/boot/grub efi=$2/efi/boot \
data=$1/usr/share/grub lib=$1/usr/lib/grub data=$1/usr/share/grub lib=$1/usr/lib/grub prefix=/boot/grub
prepare_dir ${grub}/${src} prepare_dir ${grub}/${platform}
cp ${data}/cfg/*.cfg ${grub} cp ${data}/cfg/*.cfg ${grub}
vars_to_boot_conf "${grub}/kernels.cfg" vars_to_boot_conf "${grub}/kernels.cfg"
cp ${lib}/${src}/* ${grub}/${src} cp ${lib}/${platform}/* ${grub}/${platform}
msg2 "Building %s ..." "${app}" msg2 "Building %s ..." "${img}"
local mods=(iso9660 normal extcmd boot bufio crypto gettext terminal multiboot configfile linux linux16) grub-mkimage -d ${grub}/${platform} -o ${grub}/${platform}/${img} -O ${platform} -p ${prefix} biosdisk iso9660
grub-mkimage -d ${grub}/${src} -o ${grub}/${src}/core.img -O ${src} -p /boot/grub biosdisk ${mods[@]} cat ${grub}/${platform}/cdboot.img ${grub}/${platform}/${img} > ${grub}/${platform}/eltorito.img
cat ${grub}/${src}/cdboot.img ${grub}/${src}/core.img > ${grub}/${src}/eltorito.img
case ${target_arch} in case ${target_arch} in
'i686') 'i686')
src=i386-efi platform=i386-efi
app=bootia32.efi img=bootia32.efi
;; ;;
'x86_64') 'x86_64')
src=x86_64-efi platform=x86_64-efi
app=bootx64.efi img=bootx64.efi
;; ;;
esac esac
prepare_dir ${efi} prepare_dir ${efi}
prepare_dir ${grub}/${src} prepare_dir ${grub}/${platform}
cp ${lib}/${src}/* ${grub}/${src} cp ${lib}/${platform}/* ${grub}/${platform}
msg2 "Building %s ..." "${app}" msg2 "Building %s ..." "${img}"
grub-mkimage -d ${grub}/${src} -o ${efi}/${app} -O ${src} -p /boot/grub ${mods[@]} grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660
prepare_dir ${grub}/themes prepare_dir ${grub}/themes
cp -r ${data}/themes/${iso_name}-live ${grub}/themes/ cp -r ${data}/themes/${iso_name}-live ${grub}/themes/
@ -105,8 +103,8 @@ prepare_grub(){
prepare_dir ${mnt}/efi/boot prepare_dir ${mnt}/efi/boot
msg2 "Building %s ..." "${app}" msg2 "Building %s ..." "${img}"
grub-mkimage -d ${grub}/${src} -o ${mnt}/efi/boot/${app} -O ${src} -p /boot/grub ${mods[@]} grub-mkimage -d ${grub}/${platform} -o ${mnt}/efi/boot/${img} -O ${platform} -p ${prefix} iso9660
umount_img "${mnt}" umount_img "${mnt}"
} }