diff options
author | Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> | 2015-08-03 15:01:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-18 09:05:21 +0100 |
commit | 5acf99d1afc7efa962e4e698cc09a7f08133a64e (patch) | |
tree | a628a31b707e204d5786480b009a32ed4009a939 /meta | |
parent | ea562de57590c966cd5a75fda8defecd397e6436 (diff) | |
download | poky-5acf99d1afc7efa962e4e698cc09a7f08133a64e.tar.gz |
init-install-efi.sh: Avoid /mnt/mtab creation if already present
The base-files recipe installs /mnt/mtab (it is a softlink of /proc/mounts),
so if an image includes the latter, there is no new to created it again inside
the install-efi.sh script, otherwise an error may occur as indicated on the
bug's site.
[YOCTO #7971]
(From OE-Core rev: 6c6c6528954952e1e323f5a26afd93b99913e6f2)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index a3ed74b989..fc4908ef91 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh | |||
@@ -114,7 +114,11 @@ rm -f /etc/udev/scripts/mount* | |||
114 | umount ${device}* 2> /dev/null || /bin/true | 114 | umount ${device}* 2> /dev/null || /bin/true |
115 | 115 | ||
116 | mkdir -p /tmp | 116 | mkdir -p /tmp |
117 | cat /proc/mounts > /etc/mtab | 117 | |
118 | # Create /etc/mtab if not present | ||
119 | if [ ! -e /etc/mtab ]; then | ||
120 | cat /proc/mounts > /etc/mtab | ||
121 | fi | ||
118 | 122 | ||
119 | disk_size=$(parted ${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") | 123 | disk_size=$(parted ${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") |
120 | 124 | ||