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> | 2016-07-11 23:10:10 +0100 |
commit | fb8bf6a75e9ac04d5c6213d3e2f097302f83405f (patch) | |
tree | 214bee529438a6417371a508aa397d3d41d7a1a4 /meta/recipes-core | |
parent | c282df8993828bd7b1d50cfcf637a477eaf481a1 (diff) | |
download | poky-fb8bf6a75e9ac04d5c6213d3e2f097302f83405f.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: 1679c3d7bfa1cff4e126e2ed3dff50bdd7c2eeab)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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 | ||