🐧 bump Ubuntu core images to 23.04 (kairos-io#1433)

* bump ubuntu to 23.04 and use rolling tag Signed-off-by: Mauro Morales <[email protected]> * apply overlayfs patch Signed-off-by: Mauro Morales <[email protected]> * Enable selinux on Ubuntu Signed-off-by: Mauro Morales <[email protected]> * add netboot cmdline stanzas Signed-off-by: Mauro Morales <[email protected]> * remove selinux for netboot Signed-off-by: Mauro Morales <[email protected]> --------- Signed-off-by: Mauro Morales <[email protected]>
Itxaka · Jun 15, 2023 · a7334f4 · a7334f4
1 parent 77c8a38
commit a7334f4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu
@@ -1,4 +1,5 @@
-ARG BASE_IMAGE=ubuntu:22.10
+# rolling tag points to the latest release (regardless of LTS status)
+ARG BASE_IMAGE=ubuntu:rolling
 
 FROM $BASE_IMAGE
 

diff --git a/images/Dockerfile.ubuntu-arm-rpi b/images/Dockerfile.ubuntu-arm-rpi
@@ -1,4 +1,5 @@
-ARG BASE_IMAGE=ubuntu:22.10
+# rolling tag points to the latest release (regardless of LTS status)
+ARG BASE_IMAGE=ubuntu:rolling
 ARG MODEL=generic
 
 FROM $BASE_IMAGE as base
@@ -60,7 +61,6 @@ RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install
 RUN ln -s /usr/bin/grub-editenv /usr/bin/grub2-editenv
 RUN systemctl enable systemd-networkd
 RUN systemctl enable ssh
-RUN systemctl disable rpi-eeprom-update
 
 # Fixup sudo perms
 RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo

diff --git a/overlay/files-ubuntu/etc/cos/bootargs.cfg b/overlay/files-ubuntu/etc/cos/bootargs.cfg
@@ -1,11 +1,8 @@
 set kernel=/boot/vmlinuz
 if [ -n "$recoverylabel" ]; then
-    # Removed console=ttyS0 (don't use it), and also rd.neetnet=1 which results in dupliate ips
-    # Added fancy vga=795 nomodeset
     set kernelcmd="console=tty1 console=ttyS0 root=live:LABEL=$recoverylabel rd.live.dir=/ rd.live.squashimg=$img panic=5 rd.cos.oemlabel=COS_OEM"
 else
-    # set kernelcmd="console=tty1 root=LABEL=$label cos-img/filename=$img panic=5 security=selinux selinux=1 rd.cos.oemlabel=COS_OEM rd.neednet=0 vga=795 nomodeset"
-    set kernelcmd="console=tty1 console=ttyS0 root=LABEL=$label cos-img/filename=$img panic=5 security=selinux selinux=0 rd.cos.oemlabel=COS_OEM rd.neednet=0 vga=795"
+    set kernelcmd="console=tty1 console=ttyS0 root=LABEL=$label cos-img/filename=$img panic=5 security=selinux selinux=1 rd.cos.oemlabel=COS_OEM rd.neednet=0 vga=795"
 fi
 
 set initramfs=/boot/initrd
diff --git a/scripts/netboot.sh b/scripts/netboot.sh
@@ -24,7 +24,7 @@ set dns 8.8.8.8
 ifconf
 # set config https://example.com/machine-config
 # set cmdline extra.values=1
-kernel \${url}/\${kernel} initrd=\${initrd} rd.neednet=1 ip=dhcp rd.cos.disable root=live:\${url}/\${rootfs} netboot nodepair.enable config_url=\${config} console=tty1 console=ttyS0 \${cmdline}
+kernel \${url}/\${kernel} initrd=\${initrd} rd.neednet=1 ip=dhcp rd.cos.disable root=live:\${url}/\${rootfs} netboot nodepair.enable config_url=\${config} console=tty1 console=ttyS0 rd.live.overlay.overlayfs \${cmdline}
 initrd \${url}/\${initrd}
 boot
 EOF