aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-05-15 17:36:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-20 14:53:00 +0100
commitbe0327b6a900be5434b6b1f08277faf2f65d5da8 (patch)
treeef2813264acabfb861f7b3cac097e977a7e73e04 /meta/recipes-core/initrdscripts/files/init-install-testfs.sh
parentfc5dfad6490d0b3f2529f84ae9dfbd6b00b5c380 (diff)
downloadopenembedded-core-contrib-be0327b6a900be5434b6b1f08277faf2f65d5da8.tar.gz
openembedded-core-contrib-be0327b6a900be5434b6b1f08277faf2f65d5da8.tar.bz2
openembedded-core-contrib-be0327b6a900be5434b6b1f08277faf2f65d5da8.zip
initrdscripts: fix for /run/media
mount.sh in udev-extraconf was modified to use /run/media instead of /media. Unfortunately, our scripts in initrdscripts have some dependency on the auto-mounting mechanism proviced by udev-extraconf. So these scripts should also be fixed to use /run/media instead /media, otherwise, our live image cannot work correctly. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/initrdscripts/files/init-install-testfs.sh')
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-testfs.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
index d2f2420498..26e1fb3dd2 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
@@ -151,7 +151,7 @@ mkdir -p /boot
# Handling of the target root partition
mount $rootfs /tgt_root
-mount -o rw,loop,noatime,nodiratime /media/$1/$2 /src_root
+mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root
echo "Copying rootfs files..."
cp -a /src_root/* /tgt_root
if [ -d /tgt_root/etc/ ] ; then
@@ -197,7 +197,7 @@ if [ ! -f /boot/grub/grub.cfg ] ; then
echo "kernel /vmlinuz root=$rootfs rw $3 $4 quiet" >> /boot/grub/menu.lst
fi
-cp /media/$1/vmlinuz /boot/
+cp /run/media/$1/vmlinuz /boot/
umount /boot