Alpine fixes (#489)

packages/alpine/build.yaml

@@ -20,7 +20,7 @@ package_dir: "/package"
 prelude:
   - apk update
   # multipath-tools and cryptsetup is needed to bring modules and udev rules
-  - apk add linux-rpi4 linux-firmware-none mkinitfs eudev eudev-hwids mdadm-udev device-mapper-udev lvm2 findmnt rsync parted cryptsetup multipath-tools openrc blkid
+  - apk add linux-rpi4 linux-firmware-none mkinitfs dbus eudev eudev-hwids mdadm-udev device-mapper-udev lvm2 findmnt rsync parted cryptsetup multipath-tools openrc blkid
 steps:
   - kernel=$(ls /lib/modules | head -n1) && depmod -a "${kernel}"
   - mkdir -p /package/boot
@@ -53,7 +53,7 @@ package_dir: "/package"
 prelude:
   - apk update
   # multipath-tools and cryptsetup is needed to bring modules and udev rules
-  - apk add linux-lts linux-firmware-none mkinitfs eudev eudev-hwids mdadm-udev device-mapper-udev lvm2 findmnt rsync parted cryptsetup multipath-tools openrc blkid
+  - apk add linux-lts linux-firmware-none mkinitfs dbus eudev eudev-hwids mdadm-udev device-mapper-udev lvm2 findmnt rsync parted cryptsetup multipath-tools openrc blkid
 steps:
   - kernel=$(ls /lib/modules | head -n1) && depmod -a "${kernel}"
   - mkdir -p /package/boot

packages/alpine/collection.yaml

@@ -1,7 +1,7 @@
 packages:
   - name: "alpine"
     category: "distro-kernel"
-    version: "6.1.56-2"
+    version: "6.1.56-3"
     description: "Provides kernel and custom initrd for alpine"
     labels:
       autobump.strategy: "custom"
@@ -14,7 +14,7 @@ packages:
       package.version: "6.1.56"
   - name: "alpine-rpi"
     category: "distro-kernel"
-    version: "6.1.55-2"
+    version: "6.1.55-3"
     description: "Provides kernel and custom initrd for alpine"
     labels:
       autobump.strategy: "custom"

packages/alpine/files/immucore.files

@@ -15,3 +15,4 @@
 /usr/sbin/parted
 /sbin/openrc
 /sbin/openrc-run
+/usr/bin/dbus-uuidgen

packages/static/kairos-overlay-files/collection.yaml

@@ -1,4 +1,4 @@
 packages:
   - name: "kairos-overlay-files"
     category: "static"
-    version: "1.1.1"
+    version: "1.1.2"

packages/static/kairos-overlay-files/files/system/oem/00_rootfs.yaml

@@ -123,9 +123,10 @@ stages:
       name: "Restore /etc/machine-id for systemd systems"
       commands:
         - cat /usr/local/etc/machine-id > /etc/machine-id
-    - if: '[ ! -f "/run/cos/recovery_mode" ] && [ -s /var/lib/dbus/machine-id ] && [ -f "/sbin/openrc" ]'
+    - if: '[ ! -f "/run/cos/recovery_mode" ] && [ -f "/sbin/openrc" ]'
       name: "Restore /etc/machine-id for openrc systems"
       commands:
+        - dbus-uuidgen --ensure # This makes sure that the machine-id exists and its valid
         - cat /var/lib/dbus/machine-id > /etc/machine-id
   fs:
     - if: '[ ! -f "/run/cos/recovery_mode" ] && [ ! -s /usr/local/etc/machine-id ] '

packages/static/kairos-overlay-files/files/system/oem/10_accounting.yaml

@@ -49,7 +49,7 @@ stages:
         - chown -R root:admin /usr/local/cloud-config
         - chmod 770 /usr/local/cloud-config
     - name: "Enable serial login for alpine" # https://wiki.alpinelinux.org/wiki/Enable_Serial_Console_on_Boot
-      if: '[ -e /sbin/rc-service ]'
+      if: '[ -e /sbin/openrc ]'
       commands:
         - sed -i -e 's/ttyS0.*//g' /etc/inittab
         - echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab

packages/static/kairos-overlay-files/files/system/oem/28_cgroups.yaml

@@ -1,7 +1,7 @@
 stages:
   initramfs.before:
     - name: "Setup hybrid cgroups"
-      if: '[ -e /sbin/rc-service ]'
+      if: '[ -e /etc/rc.conf ]'
       commands:
         - echo 'rc_cgroup_mode="hybrid"' >> /etc/rc.conf
         - echo 'rc_cgroup_controllers="cpuset cpu io memory hugetlb pids"' >> /etc/rc.conf

packages/static/kairos-overlay-files/files/system/oem/29_blacklist.yaml

@@ -1,6 +1,6 @@
 stages:
   initramfs.before:
     - name: "Blacklist bpfilter on Alpine ( bug: https://github.com/kairos-io/kairos/issues/277 )"
-      if: '[ -e /sbin/rc-service ]'
+      if: '[ -e /sbin/openrc ]'
       commands:
         - echo "install bpfilter /bin/false" > /etc/modprobe.d/blacklist_bpfilter.conf

packages/static/kairos-overlay-files/files/system/oem/30_ulimit.yaml

@@ -1,6 +1,6 @@
 stages:
   boot.before:
     - name: "Setup higher limit for open files"
-      if: '[ -e /sbin/rc-service ]'
+      if: '[ -e /etc/rc.conf ]'
       commands:
         - echo 'rc_ulimit="-n 1048576"' >> /etc/rc.conf

packages/static/kairos-overlay-files/files/system/oem/52_installer.yaml

@@ -26,7 +26,7 @@ stages:
         - echo "tty1::respawn:/usr/bin/kairos-agent interactive-install --shell" >> /etc/inittab
   boot:
     - if: |
-          [ "$(kairos-agent state get boot)" == "livecd_boot" ] && [ -f "/sbin/openrc" ]
+          [ "$(kairos-agent state get boot)" == "livecd_boot" ] && [ -f "/sbin/rc-service" ]
       commands:
         - rc-service kairos-webui start
     - if: |