From: Leonardo Sandoval Date: Mon, 3 Aug 2015 15:01:04 +0000 (+0000) Subject: init-install-efi.sh: Avoid /mnt/mtab creation if already present X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92da534cefb5937c69553dbe599b664dc73292f3;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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) Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie Signed-off-by: Joshua Lock --- diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index 329586d74d0..03c2a96c661 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* umount /dev/${device}* 2> /dev/null || /bin/true mkdir -p /tmp -cat /proc/mounts > /etc/mtab + +# Create /etc/mtab if not present +if [ ! -e /etc/mtab ]; then + cat /proc/mounts > /etc/mtab +fi disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//")