summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/initrdscripts/files/init-live.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 04e58d5f30..09fb479915 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -169,8 +169,8 @@ mount_and_boot() {
169 169
170 # determine which unification filesystem to use 170 # determine which unification filesystem to use
171 union_fs_type="" 171 union_fs_type=""
172 if grep -q -w "overlayfs" /proc/filesystems; then 172 if grep -q -w "overlay" /proc/filesystems; then
173 union_fs_type="overlayfs" 173 union_fs_type="overlay"
174 elif grep -q -w "aufs" /proc/filesystems; then 174 elif grep -q -w "aufs" /proc/filesystems; then
175 union_fs_type="aufs" 175 union_fs_type="aufs"
176 else 176 else
@@ -179,14 +179,15 @@ mount_and_boot() {
179 179
180 # make a union mount if possible 180 # make a union mount if possible
181 case $union_fs_type in 181 case $union_fs_type in
182 "overlayfs") 182 "overlay")
183 mkdir -p /rootfs.ro /rootfs.rw 183 mkdir -p /rootfs.ro /rootfs.rw
184 if ! mount -n --move $ROOT_MOUNT /rootfs.ro; then 184 if ! mount -n --move $ROOT_MOUNT /rootfs.ro; then
185 rm -rf /rootfs.ro /rootfs.rw 185 rm -rf /rootfs.ro /rootfs.rw
186 fatal "Could not move rootfs mount point" 186 fatal "Could not move rootfs mount point"
187 else 187 else
188 mount -t tmpfs -o rw,noatime,mode=755 tmpfs /rootfs.rw 188 mount -t tmpfs -o rw,noatime,mode=755 tmpfs /rootfs.rw
189 mount -t overlayfs -o "lowerdir=/rootfs.ro,upperdir=/rootfs.rw" overlayfs $ROOT_MOUNT 189 mkdir -p /rootfs.rw/upperdir /rootfs.rw/work
190 mount -t overlay overlay -o "lowerdir=/rootfs.ro,upperdir=/rootfs.rw/upperdir,workdir=/rootfs.rw/work" $ROOT_MOUNT
190 mkdir -p $ROOT_MOUNT/rootfs.ro $ROOT_MOUNT/rootfs.rw 191 mkdir -p $ROOT_MOUNT/rootfs.ro $ROOT_MOUNT/rootfs.rw
191 mount --move /rootfs.ro $ROOT_MOUNT/rootfs.ro 192 mount --move /rootfs.ro $ROOT_MOUNT/rootfs.ro
192 mount --move /rootfs.rw $ROOT_MOUNT/rootfs.rw 193 mount --move /rootfs.rw $ROOT_MOUNT/rootfs.rw