Make "ubuntu" the bootloader_id and don't do a cp hack.

ubuntu/focal
Simon Quigley 7 years ago
parent a0da5ae20d
commit ec8d1863c8

1
debian/changelog vendored

@ -1,6 +1,7 @@
calamares-settings-ubuntu (14) UNRELEASED; urgency=medium calamares-settings-ubuntu (14) UNRELEASED; urgency=medium
* Don't copy initrd from the live install, because that contains casper. * Don't copy initrd from the live install, because that contains casper.
* Make "ubuntu" the bootloader_id and don't do a cp hack.
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 25 Jul 2018 06:19:24 -0500 -- Simon Quigley <tsimonq2@ubuntu.com> Wed, 25 Jul 2018 06:19:24 -0500

@ -7,11 +7,6 @@ dontChroot: false
timeout: 120 timeout: 120
firmwareType: firmwareType:
efi: efi:
# grub hack
- -mkdir /boot/efi/EFI/ubuntu
- -cp /boot/efi/EFI/lubuntu/grub.cfg /boot/efi/EFI/ubuntu/
# normal user setup
- -for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/calamares.desktop || exit 0; done - -for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/calamares.desktop || exit 0; done
bios: bios:
# normal user setup
- -for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/calamares.desktop || exit 0; done - -for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/calamares.desktop || exit 0; done

@ -30,4 +30,4 @@ grubCfg: "/boot/grub/grub.cfg"
# setting the option here, take care to use only valid directory # setting the option here, take care to use only valid directory
# names since no sanitizing is done. # names since no sanitizing is done.
# #
efiBootloaderId: "lubuntu" efiBootloaderId: "ubuntu"

Loading…
Cancel
Save