commit:     7840e73dde3ff715806aff61708f134479581d9c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 19:40:36 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 13:02:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7840e73d

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 <whissi <AT> gentoo.org>

 eclass/mount-boot.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mount-boot.eclass b/eclass/mount-boot.eclass
index 4d886c8d847..938df6732f4 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

Reply via email to