Fix tmpfs fstab entry

Signed-off-by: Itxaka <itxaka@spectrocloud.com>
This commit is contained in:
Itxaka 2023-02-09 10:34:43 +01:00
parent 61e6607285
commit d0816bb7e3
2 changed files with 2 additions and 3 deletions

View File

@ -10,5 +10,4 @@ Conflicts=initrd-switch-root.target
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
StandardOutput=journal+console StandardOutput=journal+console
ExecStartPre=-/usr/bin/systemctl stop oem.mount
ExecStart=/usr/bin/immucore start ExecStart=/usr/bin/immucore start

View File

@ -32,7 +32,7 @@ func baseOverlay(overlay Overlay) (mountOperation, error) {
// TODO: Fix this // TODO: Fix this
// Currently stores it wrongly the the fstab as `tmpfs tmpfs:20% tmpfs size=20% 0 0` // 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` // 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{ return mountOperation{
MountOption: tmpMount, MountOption: tmpMount,
FstabEntry: *tmpFstab, FstabEntry: *tmpFstab,
@ -44,7 +44,7 @@ func baseOverlay(overlay Overlay) (mountOperation, error) {
tmpFstab := internalUtils.MountToFstab(blockMount) tmpFstab := internalUtils.MountToFstab(blockMount)
// TODO: Check if this is properly written to fstab, currently have no examples // 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"] = "" tmpFstab.MntOps["default"] = ""
return mountOperation{ return mountOperation{