From: Thomas Deutschmann Date: Sat, 10 Aug 2019 19:40:36 +0000 (+0200) Subject: mount-boot.eclass: Fix ro check X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7840e73dde3ff715806aff61708f134479581d9c;p=gentoo.git mount-boot.eclass: Fix ro check Make sure we check only /boot mount and not any mount containing '/boot'. Closes: https://bugs.gentoo.org/691874 Signed-off-by: Thomas Deutschmann --- diff --git a/eclass/mount-boot.eclass b/eclass/mount-boot.eclass index 4d886c8d8475..938df6732f43 100644 --- a/eclass/mount-boot.eclass +++ b/eclass/mount-boot.eclass @@ -54,7 +54,7 @@ mount-boot_check_status() { # note that /dev/BOOT is in the Gentoo default /etc/fstab file local fstabstate=$(awk '!/^#|^[[:blank:]]+#|^\/dev\/BOOT/ {print $2}' /etc/fstab | egrep "^/boot$" ) local procstate=$(awk '$2 ~ /^\/boot$/ {print $2}' /proc/mounts) - local proc_ro=$(awk '{ print $2 " ," $4 "," }' /proc/mounts | sed -n '/\/boot .*,ro,/p') + local proc_ro=$(awk '{ print $2 " ," $4 "," }' /proc/mounts | sed -n '/^\/boot .*,ro,/p') if [ -n "${fstabstate}" ] && [ -n "${procstate}" ] ; then if [ -n "${proc_ro}" ] ; then