apply overlayfs patch

Signed-off-by: Mauro Morales <[email protected]>
kairos-io · Jun 2, 2023 · a6cef2e · a6cef2e
1 parent 53afe5c
commit a6cef2e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu
@@ -57,6 +57,7 @@ RUN apt-get update \
     os-prober \
     packagekit-tools \
     parted \
+    patch \
     pigz \
     pkg-config \
     polkitd \
@@ -88,8 +89,14 @@ 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
+
 # Enable tmp
-RUN cp -v /usr/share/systemd/tmp.mount /etc/systemd/system/ 
+RUN cp -v /usr/share/systemd/tmp.mount /etc/systemd/system/
 RUN systemctl enable tmp.mount
 
 # Fixup sudo perms

diff --git a/images/Dockerfile.ubuntu-arm-rpi b/images/Dockerfile.ubuntu-arm-rpi
@@ -61,7 +61,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/