Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 12 Aug 2019 13:03:10
Message-Id: 1565614974.7840e73dde3ff715806aff61708f134479581d9c.whissi@gentoo
1 commit: 7840e73dde3ff715806aff61708f134479581d9c
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 10 19:40:36 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 12 13:02:54 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7840e73d
7
8 mount-boot.eclass: Fix ro check
9
10 Make sure we check only /boot mount and not any mount
11 containing '/boot'.
12
13 Closes: https://bugs.gentoo.org/691874
14 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
15
16 eclass/mount-boot.eclass | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19 diff --git a/eclass/mount-boot.eclass b/eclass/mount-boot.eclass
20 index 4d886c8d847..938df6732f4 100644
21 --- a/eclass/mount-boot.eclass
22 +++ b/eclass/mount-boot.eclass
23 @@ -54,7 +54,7 @@ mount-boot_check_status() {
24 # note that /dev/BOOT is in the Gentoo default /etc/fstab file
25 local fstabstate=$(awk '!/^#|^[[:blank:]]+#|^\/dev\/BOOT/ {print $2}' /etc/fstab | egrep "^/boot$" )
26 local procstate=$(awk '$2 ~ /^\/boot$/ {print $2}' /proc/mounts)
27 - local proc_ro=$(awk '{ print $2 " ," $4 "," }' /proc/mounts | sed -n '/\/boot .*,ro,/p')
28 + local proc_ro=$(awk '{ print $2 " ," $4 "," }' /proc/mounts | sed -n '/^\/boot .*,ro,/p')
29
30 if [ -n "${fstabstate}" ] && [ -n "${procstate}" ] ; then
31 if [ -n "${proc_ro}" ] ; then