Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 17:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kvm-derives-uefi' of git+ssh://git.launchpad.net/~davidkrauser/livecd-rootfs/+git/livecd-rootfs into ubuntu/master

Browse Source
This commit is contained in:
Dimitri John Ledkov 2019-07-26 14:35:16 -03:00
commit 584ac368b0
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary
View File

@ -28,7 +28,7 @@ esac
mount_d=$(mktemp -d) mount_d=$(mktemp -d)
create_derivative "disk" "kvm" #sets ${derivative_img} create_derivative uefi kvm #sets ${derivative_img}
mount_disk_image ${derivative_img} ${mount_d} mount_disk_image ${derivative_img} ${mount_d}
# unmount disk image and remove created folders on exit # unmount disk image and remove created folders on exit
@ -46,12 +46,9 @@ trap cleanup_kvm EXIT
divert_grub "${mount_d}" divert_grub "${mount_d}"
replace_kernel ${mount_d} "linux-kvm" replace_kernel ${mount_d} "linux-kvm"
chroot "${mount_d}" update-grub
undivert_grub "${mount_d}" undivert_grub "${mount_d}"
#setup grub correctly
env DEBIAN_FRONTEND=noninteractive chroot "${mount_d}" update-grub
replace_grub_root_with_label "${mount_d}"
# Remove initramfs for kvm image # Remove initramfs for kvm image
env DEBIAN_FRONTEND=noninteractive chroot "${mount_d}" apt-get \ env DEBIAN_FRONTEND=noninteractive chroot "${mount_d}" apt-get \
purge -y initramfs-tools busybox-initramfs purge -y initramfs-tools busybox-initramfs
@ -70,4 +67,4 @@ create_manifest ${mount_d} livecd.ubuntu-cpc.disk-kvm.manifest
umount_disk_image ${mount_d} umount_disk_image ${mount_d}
rm -rf ${mount_d} rm -rf ${mount_d}
convert_to_qcow2 ${derivative_img} livecd.ubuntu-cpc.disk-kvm.img convert_to_qcow2 ${derivative_img} livecd.ubuntu-cpc.disk-kvm.img