diff --git a/mkosi.extra/usr/bin/_kdeos-overlay b/mkosi.extra/usr/bin/_kdeos-overlay index 3303b99..b8293cd 100755 --- a/mkosi.extra/usr/bin/_kdeos-overlay +++ b/mkosi.extra/usr/bin/_kdeos-overlay @@ -40,7 +40,7 @@ mount -v \ "$rootdisk" "${sysroot}/usr/lib/locale" mount -v \ -o rw,subvol=@snap \ - "$rootdisk" "${sysroot}/snap" + "$rootdisk" "${sysroot}/var/lib/snapd/snap" mount -v \ -t overlay \ -o "rw,lowerdir=${sysroot}/etc,upperdir=${sysroot}/system/@etc-overlay/upper,workdir=${sysroot}/system/@etc-overlay/work,index=off,metacopy=off" \ diff --git a/mkosi.postinst.chroot b/mkosi.postinst.chroot index 6821524..8da11fb 100755 --- a/mkosi.postinst.chroot +++ b/mkosi.postinst.chroot @@ -7,7 +7,7 @@ set -ex env mkdir --mode 0700 /system # for the kdeos-overlay.service -mkdir /snap # for snapd +ln -s var/lib/snapd/snap /snap # for snapd export SYSTEMD_ESP_PATH="$BOOT_MNT" mkdir --mode 0700 "$SYSTEMD_ESP_PATH" @@ -66,6 +66,7 @@ pacman --noconfirm --upgrade /home/builder/.cache/yay/snapd/*.pkg.tar.* pacman --noconfirm --upgrade /home/builder/.cache/yay/steam-devices-git/*.pkg.tar.* pacman --noconfirm --upgrade /home/builder/.cache/yay/systemd-bootchart/*.pkg.tar.* touch /var/lib/snapd/apparmor/snap-confine/.keep # this has been gotten lost in the past for unknown reasons +mkdir /var/lib/snapd/snap/ # make sure the final snap location exists. we'll mount into it userdel --remove builder rm /etc/sudoers.d/builder rm -rf /home/builder