Jelajahi Sumber

Fixed overlayfs mount parameters

overlayfs now requires workdir, a directory on the same filesystem
with upperdir.
Maxim Kammerer 11 tahun lalu
induk
melakukan
ace0f03c9b
2 mengubah file dengan 6 tambahan dan 5 penghapusan
  1. 4 4
      src/etc/fstab
  2. 2 1
      src/root/initrd/init

+ 4 - 4
src/etc/fstab

@@ -9,15 +9,15 @@
 # (if not mounted; fstab is consulted except for /sys/*)
 # sysfs:      /sys{,/kernel{/security,/debug,/config,/cgroup{,/cpu,...,/openrc}},/firmware/efi/efivars,/fs/fuse/connections}
 # udev-mount: /dev
-# devfs:      /dev{/pts,/shm[disabled]}
+# devfs:      /dev{/mqueue,/pts,/shm[disabled]}
 
 # Empty writable directories (/mnt/rwroot's mountpoint options)
 /mnt/rwroot/tmp /tmp none bind 0 0
 
 # Overlayed subdirectories mounted into ro /
-overlayfs /etc  overlayfs nodev,lowerdir=/mnt/live/etc,upperdir=/mnt/rwroot/etc   0 0
-overlayfs /var  overlayfs nodev,lowerdir=/mnt/live/var,upperdir=/mnt/rwroot/var   0 0
-overlayfs /home overlayfs nodev,lowerdir=/mnt/live/home,upperdir=/mnt/rwroot/home 0 0
+overlayfs /etc  overlayfs nodev,lowerdir=/mnt/live/etc,upperdir=/mnt/rwroot/etc,workdir=/mnt/rwroot/etc-work    0 0
+overlayfs /var  overlayfs nodev,lowerdir=/mnt/live/var,upperdir=/mnt/rwroot/var,workdir=/mnt/rwroot/var-work    0 0
+overlayfs /home overlayfs nodev,lowerdir=/mnt/live/home,upperdir=/mnt/rwroot/home,workdir=/mnt/rwroot/home-work 0 0
 
 # Mounted by init.d services (after localmount):
 # procfs:     /proc/sys/fs/binfmt_misc

+ 2 - 1
src/root/initrd/init

@@ -40,7 +40,8 @@ mount -t sysfs sysfs /sys
 #   + nodev:              overlayfs mount option
 # (however, nodev still affects bind mounts)
 mount -t tmpfs -o mode=700,nosuid,nodev,noexec,size=${rwrootsz} tmpfs ${srwroot}
-mkdir -m  755 ${srwroot}/etc ${srwroot}/var ${srwroot}/home
+mkdir -m  755 ${srwroot}/etc      ${srwroot}/var      ${srwroot}/home
+mkdir -m  700 ${srwroot}/etc-work ${srwroot}/var-work ${srwroot}/home-work
 mkdir -m 1777 ${srwroot}/tmp
 
 # /etc and /home can be allowed to exec new/modified executables: