Skip to content

Commit 149b5db

Browse files
authored
Merge pull request #2818 from OSInside/targeted_root
Update overlay integration test for partial write
2 parents c12c735 + 28da24a commit 149b5db

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

build-tests/x86/tumbleweed/test-image-overlayroot/appliance.kiwi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<type
7272
image="oem"
7373
filesystem="xfs"
74-
kernelcmdline="console=ttyS0 rd.systemd.verity=1 security=selinux selinux=1 enforcing=1"
74+
kernelcmdline="console=ttyS0 rd.systemd.verity=1 security=selinux selinux=1 enforcing=1 rd.root.overlay.readonly"
7575
firmware="efi"
7676
format="vmdk"
7777
overlayroot="true"

build-tests/x86/tumbleweed/test-image-overlayroot/config.sh

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,38 @@ for profile in ${kiwi_profiles//,/ }; do
4343
fi
4444
done
4545
fi
46+
if [ "${profile}" = "sdboot_uki_verity_erofs" ];then
47+
# systemd remount doesn't like overlays on read-only (/)
48+
systemctl mask systemd-remount-fs.service
49+
50+
# following directories are created by services and must
51+
# exist prior read-only
52+
mkdir -p /var/lib/private/systemd/timesync
53+
mkdir -p /var/lib/systemd/timesync
54+
mkdir -p /var/lib/systemd/linger
55+
mkdir -p /etc/lvm/devices
56+
57+
# ssh host keys must exist prior read-only
58+
/usr/sbin/sshd-gen-keys-start
59+
60+
cat >/etc/fstab.append <<- EOF
61+
# we want home on the persistent storage if present
62+
overlay /home overlay defaults,lowerdir=/run/overlay/rootfsbase/home,upperdir=/run/overlay/overlayfs/home/rw,workdir=/run/overlay/overlayfs/home/work 0 0
63+
64+
# we want root home to be 128M in memory
65+
tmpfs /run/overlay/overlayfs/root tmpfs defaults,size=128M 0 0
66+
overlay /root overlay defaults,x-systemd.required-by=run-overlay-overlayfs-root.mount,lowerdir=/run/overlay/rootfsbase/root,upperdir=/run/overlay/overlayfs/root/rw,workdir=/run/overlay/overlayfs/root/work 0 0
67+
68+
# required write areas on a read-only (/)
69+
tmpfs /etc/lvm/devices tmpfs defaults 0 0
70+
tmpfs /tmp tmpfs defaults 0 0
71+
tmpfs /var/tmp tmpfs defaults 0 0
72+
tmpfs /var/log tmpfs defaults 0 0
73+
tmpfs /var/lib/private/systemd/timesync tmpfs defaults 0 0
74+
tmpfs /var/lib/systemd/timesync tmpfs defaults 0 0
75+
tmpfs /var/lib/systemd/linger tmpfs defaults 0 0
76+
EOF
77+
fi
4678
done
4779

4880
#======================================

0 commit comments

Comments
 (0)