diff options
Diffstat (limited to 'meta/recipes-core/initrdscripts/files/init-live.sh')
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-live.sh | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh index 82042bf2ee..ca4135141f 100644 --- a/meta/recipes-core/initrdscripts/files/init-live.sh +++ b/meta/recipes-core/initrdscripts/files/init-live.sh | |||
@@ -7,7 +7,6 @@ ROOT_IMAGE="rootfs.img" | |||
7 | MOUNT="/bin/mount" | 7 | MOUNT="/bin/mount" |
8 | UMOUNT="/bin/umount" | 8 | UMOUNT="/bin/umount" |
9 | ISOLINUX="" | 9 | ISOLINUX="" |
10 | UNIONFS="no" | ||
11 | 10 | ||
12 | # Copied from initramfs-framework. The core of this script probably should be | 11 | # Copied from initramfs-framework. The core of this script probably should be |
13 | # turned into initramfs-framework modules to reduce duplication. | 12 | # turned into initramfs-framework modules to reduce duplication. |
@@ -142,25 +141,10 @@ case $label in | |||
142 | boot) | 141 | boot) |
143 | mkdir $ROOT_MOUNT | 142 | mkdir $ROOT_MOUNT |
144 | mknod /dev/loop0 b 7 0 2>/dev/null | 143 | mknod /dev/loop0 b 7 0 2>/dev/null |
145 | 144 | if ! $MOUNT -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE $ROOT_MOUNT ; then | |
146 | 145 | fatal "Could not mount rootfs image" | |
147 | if [ "$UNIONFS" = "yes" ]; then | ||
148 | mkdir /rootfs-tmp | ||
149 | |||
150 | if ! $MOUNT -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE /rootfs-tmp ; then | ||
151 | fatal "Could not mount rootfs image" | ||
152 | else | ||
153 | mkdir /cow | ||
154 | mount -t tmpfs -o rw,noatime,mode=755 tmpfs /cow | ||
155 | mount -t unionfs -o dirs=/cow:/rootfs-tmp=ro unionfs $ROOT_MOUNT | ||
156 | boot_live_root | ||
157 | fi | ||
158 | else | 146 | else |
159 | if ! $MOUNT -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE $ROOT_MOUNT ; then | 147 | boot_live_root |
160 | fatal "Could not mount rootfs image" | ||
161 | else | ||
162 | boot_live_root | ||
163 | fi | ||
164 | fi | 148 | fi |
165 | ;; | 149 | ;; |
166 | install|install-efi) | 150 | install|install-efi) |