🐧 ARM enhancements (kairos-io#257)

* 🐧 Add net.ifnames to ARM images * 🐧 Add wpa_supplicant to openSUSE ARM image
c0ffee · Oct 21, 2022 · ca53fe6 · ca53fe6
1 parent 889e6c2
commit ca53fe6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/images/Dockerfile.opensuse-arm-rpi b/images/Dockerfile.opensuse-arm-rpi
@@ -80,4 +80,5 @@ RUN zypper in -y \
     timezone \
     tmux \
     vim \
+    wpa_supplicant \
     which && zypper cc
diff --git a/overlay/files-opensuse-arm-rpi/etc/cos/bootargs.cfg b/overlay/files-opensuse-arm-rpi/etc/cos/bootargs.cfg
@@ -10,9 +10,9 @@ set kernel=/boot/vmlinuz
 # https://en.opensuse.org/HCL:Raspberry_Pi3#DSI_output_not_supported_by_VC4_driver,
 # https://bugzilla.opensuse.org/show_bug.cgi?id=1181683 and https://github.com/raspberrypi/linux/issues/4020
 if [ -n "$recoverylabel" ]; then
-    set kernelcmd="console=tty1 console=ttyS0,115200 root=live:LABEL=$recoverylabel rd.live.dir=/ rd.live.squashimg=$img panic=5 modprobe.blacklist=vc4 rd.cos.oemtimeout=10"
+    set kernelcmd="console=tty1 console=ttyS0,115200 root=live:LABEL=$recoverylabel net.ifnames=1 rd.live.dir=/ rd.live.squashimg=$img panic=5 modprobe.blacklist=vc4 rd.cos.oemtimeout=10"
 else
-    set kernelcmd="console=tty1 console=ttyS0,115200 root=LABEL=$label cos-img/filename=$img panic=5 security=selinux selinux=1 modprobe.blacklist=vc4 rd.cos.oemtimeout=10 rd.cos.oemlabel=COS_OEM"
+    set kernelcmd="console=tty1 console=ttyS0,115200 root=LABEL=$label net.ifnames=1 cos-img/filename=$img panic=5 security=selinux selinux=1 modprobe.blacklist=vc4 rd.cos.oemtimeout=10 rd.cos.oemlabel=COS_OEM"
 fi
 
 set initramfs=/boot/initrd
diff --git a/overlay/files/etc/cos/bootargs.cfg b/overlay/files/etc/cos/bootargs.cfg
@@ -1,7 +1,7 @@
 set kernel=/boot/vmlinuz
 if [ -n "$recoverylabel" ]; then
     # Boot arguments when the image is used as recovery
-    set kernelcmd="console=tty1 console=ttyS0 root=live:LABEL=$recoverylabel rd.live.dir=/ rd.live.squashimg=$img panic=5 rd.cos.oemlabel=COS_OEM"
+    set kernelcmd="console=tty1 console=ttyS0 root=live:LABEL=$recoverylabel net.ifnames=1 rd.live.dir=/ rd.live.squashimg=$img panic=5 rd.cos.oemlabel=COS_OEM"
 else
     # Boot arguments when the image is used as active/passive
     set kernelcmd="console=tty1 console=ttyS0 root=LABEL=$label net.ifnames=1 cos-img/filename=$img rd.emergency=reboot rd.shell=0 panic=5 security=selinux rd.cos.oemlabel=COS_OEM selinux=1 fsck.mode=force fsck.repair=yes systemd.crash_reboot=yes"