diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-02-27 01:53:34 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-02-27 01:53:34 +0000 |
| commit | ad28fdca634daf1d4010f71c9de957f3376ffffd (patch) | |
| tree | e49ba6922368d67a54e0350d054899ed455ba81c /eclass/mount-boot.eclass | |
| parent | tweak output case to avoid confusing people #260214 by Caleb Cushing (diff) | |
| download | gentoo-2-ad28fdca634daf1d4010f71c9de957f3376ffffd.tar.gz gentoo-2-ad28fdca634daf1d4010f71c9de957f3376ffffd.tar.bz2 gentoo-2-ad28fdca634daf1d4010f71c9de957f3376ffffd.zip | |
make matching ro in the options field a bit more robust #260214 by Joe User
Diffstat (limited to 'eclass/mount-boot.eclass')
| -rw-r--r-- | eclass/mount-boot.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/mount-boot.eclass b/eclass/mount-boot.eclass index 3bc16d118ad7..4a0818a743a0 100644 --- a/eclass/mount-boot.eclass +++ b/eclass/mount-boot.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mount-boot.eclass,v 1.15 2008/11/27 18:36:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mount-boot.eclass,v 1.16 2009/02/27 01:53:34 vapier Exp $ # # This eclass is really only useful for bootloaders. # @@ -25,7 +25,7 @@ mount-boot_mount_boot_partition() { # 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 |