From d0816bb7e384fda1fca0a437d172a63126f61057 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Thu, 9 Feb 2023 10:34:43 +0100 Subject: [PATCH] Fix tmpfs fstab entry Signed-off-by: Itxaka --- dracut/28immucore/immucore.service | 1 - pkg/mount/fs.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dracut/28immucore/immucore.service b/dracut/28immucore/immucore.service index 00b70d0..e6d4944 100644 --- a/dracut/28immucore/immucore.service +++ b/dracut/28immucore/immucore.service @@ -10,5 +10,4 @@ Conflicts=initrd-switch-root.target Type=oneshot RemainAfterExit=yes StandardOutput=journal+console -ExecStartPre=-/usr/bin/systemctl stop oem.mount ExecStart=/usr/bin/immucore start \ No newline at end of file diff --git a/pkg/mount/fs.go b/pkg/mount/fs.go index 502e99a..781e776 100644 --- a/pkg/mount/fs.go +++ b/pkg/mount/fs.go @@ -32,7 +32,7 @@ func baseOverlay(overlay Overlay) (mountOperation, error) { // TODO: Fix this // Currently stores it wrongly the the fstab as `tmpfs tmpfs:20% tmpfs size=20% 0 0` // Correct format should be `tmpfs /run/overlay tmpfs defaults,size=20% 0 0` - tmpFstab.File = internalUtils.CleanSysrootForFstab(overlay.BackingBase) + tmpFstab.File = internalUtils.CleanSysrootForFstab(overlay.Base) return mountOperation{ MountOption: tmpMount, FstabEntry: *tmpFstab, @@ -44,7 +44,7 @@ func baseOverlay(overlay Overlay) (mountOperation, error) { tmpFstab := internalUtils.MountToFstab(blockMount) // TODO: Check if this is properly written to fstab, currently have no examples - tmpFstab.File = internalUtils.CleanSysrootForFstab(overlay.BackingBase) + tmpFstab.File = internalUtils.CleanSysrootForFstab(overlay.Base) tmpFstab.MntOps["default"] = "" return mountOperation{