mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-05-09 01:41:31 +00:00
Merge branch 'kvm-derives-uefi' of git+ssh://git.launchpad.net/~davidkrauser/livecd-rootfs/+git/livecd-rootfs into ubuntu/master
This commit is contained in:
commit
584ac368b0
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user