Apply also for arm based images

Signed-off-by: Mauro Morales <[email protected]>
kairos-io · May 22, 2023 · 4245430 · 4245430
1 parent cbf1235
commit 4245430
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu
@@ -89,6 +89,9 @@ RUN ln -s /usr/bin/grub-editenv /usr/bin/grub2-editenv
 RUN systemctl enable systemd-networkd
 RUN systemctl enable ssh
 
+# workaround https://github.com/systemd/systemd/issues/12231
+# see also: https://github.com/OSInside/kiwi/issues/1015
+# TODO: backport patch into packages
 COPY images/dracut-missing-overlay-dirs.patch /
 RUN cd /usr/lib/dracut/modules.d/90dmsquash-live && patch < /dracut-missing-overlay-dirs.patch && rm -rf /dracut-missing-overlay-dirs.patch
 

diff --git a/images/Dockerfile.ubuntu-arm-rpi b/images/Dockerfile.ubuntu-arm-rpi
@@ -47,6 +47,7 @@ RUN apt-get update && apt-get install -y \
     open-vm-tools \
     openssh-server \
     parted \
+    patch \
     polkitd \
     rsync \
     snapd \
@@ -61,7 +62,12 @@ 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
+
+# workaround https://github.com/systemd/systemd/issues/12231
+# see also: https://github.com/OSInside/kiwi/issues/1015
+# TODO: backport patch into packages
+COPY images/dracut-missing-overlay-dirs.patch /
+RUN cd /usr/lib/dracut/modules.d/90dmsquash-live && patch < /dracut-missing-overlay-dirs.patch && rm -rf /dracut-missing-overlay-dirs.patch
 
 # Enable tmp
 RUN cp -v /usr/share/systemd/tmp.mount /etc/systemd/system/