From ba5e437bc7335468a70ea293496f78e1a9d66287 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 28 Jun 2013 15:48:52 +0800 Subject: initrdscripts: unionfs cleanup The unionfs has been disabled for more than a year and it's not going to be used any more. This patch cleans up the unionfs related code. [YOCTO #4761] [YOCTO #1487] Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/recipes-core/initrdscripts/files/init-live.sh | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'meta/recipes-core/initrdscripts/files/init-live.sh') 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" MOUNT="/bin/mount" UMOUNT="/bin/umount" ISOLINUX="" -UNIONFS="no" # Copied from initramfs-framework. The core of this script probably should be # turned into initramfs-framework modules to reduce duplication. @@ -142,25 +141,10 @@ case $label in boot) mkdir $ROOT_MOUNT mknod /dev/loop0 b 7 0 2>/dev/null - - - if [ "$UNIONFS" = "yes" ]; then - mkdir /rootfs-tmp - - if ! $MOUNT -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE /rootfs-tmp ; then - fatal "Could not mount rootfs image" - else - mkdir /cow - mount -t tmpfs -o rw,noatime,mode=755 tmpfs /cow - mount -t unionfs -o dirs=/cow:/rootfs-tmp=ro unionfs $ROOT_MOUNT - boot_live_root - fi + if ! $MOUNT -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE $ROOT_MOUNT ; then + fatal "Could not mount rootfs image" else - if ! $MOUNT -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE $ROOT_MOUNT ; then - fatal "Could not mount rootfs image" - else - boot_live_root - fi + boot_live_root fi ;; install|install-efi) -- cgit v1.2.3