Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐧 bump Ubuntu core images to 23.04 #1433

Merged
merged 5 commits into from
Jun 14, 2023
Merged

🐧 bump Ubuntu core images to 23.04 #1433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2d305cb
bump ubuntu to 23.04 and use rolling tag
mauromorales May 19, 2023
44cf826
apply overlayfs patch
mauromorales May 26, 2023
afa4d49
Enable selinux on Ubuntu
mauromorales Jun 6, 2023
93d12e5
add netboot cmdline stanzas
mauromorales Jun 6, 2023
f084b0d
remove selinux for netboot
mauromorales Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion images/Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions images/Dockerfile.ubuntu-arm-rpi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions overlay/files-ubuntu/etc/cos/bootargs.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion scripts/netboot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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