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-12-08 13:27:12 +0000 |
commit | e0b08244709d0f6e07a33c3ae275f1f89d891afc (patch) | |
tree | cc580cd1677907bbe2e32669816539ce415c5d60 /meta | |
parent | f251052c88f1f561cd12948de69d06de30a0823e (diff) | |
download | poky-e0b08244709d0f6e07a33c3ae275f1f89d891afc.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 master rev: 6c6c6528954952e1e323f5a26afd93b99913e6f2)
(From OE-Core rev: 92da534cefb5937c69553dbe599b664dc73292f3)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
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 329586d74d..03c2a96c66 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh | |||
@@ -97,7 +97,11 @@ rm -f /etc/udev/scripts/mount* | |||
97 | umount /dev/${device}* 2> /dev/null || /bin/true | 97 | umount /dev/${device}* 2> /dev/null || /bin/true |
98 | 98 | ||
99 | mkdir -p /tmp | 99 | mkdir -p /tmp |
100 | cat /proc/mounts > /etc/mtab | 100 | |
101 | # Create /etc/mtab if not present | ||
102 | if [ ! -e /etc/mtab ]; then | ||
103 | cat /proc/mounts > /etc/mtab | ||
104 | fi | ||
101 | 105 | ||
102 | disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") | 106 | disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") |
103 | 107 | ||