diff --git a/README.md b/README.md index 5437e222..1292206d 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ mkdir $HOME/live-ubuntu-from-scratch sudo debootstrap \ --arch=amd64 \ --variant=minbase \ - focal \ + noble \ $HOME/live-ubuntu-from-scratch/chroot \ http://us.archive.ubuntu.com/ubuntu/ ``` @@ -168,12 +168,10 @@ From this point we will be configuring the `live system`. sudo \ ubuntu-standard \ casper \ - lupin-casper \ discover \ laptop-detect \ os-prober \ network-manager \ - resolvconf \ net-tools \ wireless-tools \ wpagui \ @@ -185,6 +183,8 @@ From this point we will be configuring the `live system`. grub2-common \ grub-efi-amd64-signed \ shim-signed \ + memtest86+ \ + mtools \ binutils ``` @@ -217,9 +217,9 @@ From this point we will be configuring the `live system`. 2. Console setup -

- -

+

+ +

11. **Install window manager** @@ -328,40 +328,20 @@ From this point we will be configuring the `live system`.

- 2. Reconfigure resolvconf - - ```shell - dpkg-reconfigure resolvconf - ``` - - 1. *Confirm changes* -

- -

- -

- -

- -

- -

- - 3. Configure network-manager + 2. Configure network-manager ```shell cat < /etc/NetworkManager/NetworkManager.conf [main] - rc-manager=resolvconf + rc-manager=none plugins=ifupdown,keyfile - dns=dnsmasq + dns=systemd-resolved [ifupdown] managed=false - EOF ``` - 4. Reconfigure network-manager + 3. Reconfigure network-manager ```shell dpkg-reconfigure network-manager diff --git a/scripts/chroot_build.sh b/scripts/chroot_build.sh index 42e5a053..57b321a2 100755 --- a/scripts/chroot_build.sh +++ b/scripts/chroot_build.sh @@ -180,14 +180,11 @@ function build_image() { cp /boot/initrd.img-**-**-generic casper/initrd # memtest86 - case $TARGET_UBUNTU_VERSION in - "noble") - cp /boot/memtest86+x64.bin install/memtest86+ - ;; - *) - cp /boot/memtest86+.bin install/memtest86+ - ;; - esac + if [ -f "/boot/memtest86+x64.bin" ]; then + cp /boot/memtest86+x64.bin install/memtest86+ + else + cp /boot/memtest86+.bin install/memtest86+ + fi # memtest86++ wget --progress=dot https://www.memtest86.com/downloads/memtest86-usb.zip -O install/memtest86-usb.zip