diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-05-15 17:36:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-20 14:53:12 +0100 |
commit | 8293f564685d0f587ab63a107285625dc4f98f1c (patch) | |
tree | c66fce8fe0427cf08bf08cacf6ed422cddf6e19f /meta/recipes-core/initrdscripts/files/init-install.sh | |
parent | 77b4b25c360aaa311a481786ae32e06a2b29feb1 (diff) | |
download | poky-8293f564685d0f587ab63a107285625dc4f98f1c.tar.gz |
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.
(From OE-Core rev: be0327b6a900be5434b6b1f08277faf2f65d5da8)
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.sh')
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index 8e433d5eda..b1600030f5 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh | |||
@@ -151,7 +151,7 @@ mkdir -p /boot | |||
151 | 151 | ||
152 | # Handling of the target root partition | 152 | # Handling of the target root partition |
153 | mount $rootfs /tgt_root | 153 | mount $rootfs /tgt_root |
154 | mount -o rw,loop,noatime,nodiratime /media/$1/$2 /src_root | 154 | mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root |
155 | echo "Copying rootfs files..." | 155 | echo "Copying rootfs files..." |
156 | cp -a /src_root/* /tgt_root | 156 | cp -a /src_root/* /tgt_root |
157 | if [ -d /tgt_root/etc/ ] ; then | 157 | if [ -d /tgt_root/etc/ ] ; then |
@@ -194,7 +194,7 @@ if [ ! -f /boot/grub/grub.cfg ] ; then | |||
194 | echo "kernel /vmlinuz root=$rootfs rw $3 $4 quiet" >> /boot/grub/menu.lst | 194 | echo "kernel /vmlinuz root=$rootfs rw $3 $4 quiet" >> /boot/grub/menu.lst |
195 | fi | 195 | fi |
196 | 196 | ||
197 | cp /media/$1/vmlinuz /boot/ | 197 | cp /run/media/$1/vmlinuz /boot/ |
198 | 198 | ||
199 | umount /boot | 199 | umount /boot |
200 | 200 | ||