summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-06-28 15:48:52 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-28 11:02:40 +0100
commit76ccbba7488cd0bca729568390b4e316a90b4c8e (patch)
tree0fe0912d6c96445a54a0045da787f25496513dd3
parent44b3c8dfa45fa6a32db46b851a7029e1bacaefb1 (diff)
downloadpoky-76ccbba7488cd0bca729568390b4e316a90b4c8e.tar.gz
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] (From OE-Core rev: ba5e437bc7335468a70ea293496f78e1a9d66287) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initrdscripts/files/init-live.sh22
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb7
2 files changed, 3 insertions, 26 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"
7MOUNT="/bin/mount" 7MOUNT="/bin/mount"
8UMOUNT="/bin/umount" 8UMOUNT="/bin/umount"
9ISOLINUX="" 9ISOLINUX=""
10UNIONFS="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)
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
index 0cbfe0288b..8626bb5b33 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
@@ -7,13 +7,6 @@ SRC_URI = "file://init-live.sh"
7 7
8PR = "r11" 8PR = "r11"
9 9
10do_compile() {
11 #if grep -q "CONFIG_UNION_FS=y" ${STAGING_KERNEL_DIR}/.config; then
12 # sed -i 's/UNIONFS="no"/UNIONFS="yes"/g' ${WORKDIR}/init-live.sh
13 #fi
14 :
15}
16
17do_install() { 10do_install() {
18 install -m 0755 ${WORKDIR}/init-live.sh ${D}/init 11 install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
19} 12}