summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Zoffoli <xmerlin@gentoo.org>2005-06-14 09:46:46 +0000
committerChristian Zoffoli <xmerlin@gentoo.org>2005-06-14 09:46:46 +0000
commiteba550b1026870fb8d4a73b99b9f11d75a5342b6 (patch)
tree70f256ba964d9e3105ce6347ed68ddc7d38dc405 /sys-fs/gfs
parentadd lirc (diff)
downloadhistorical-eba550b1026870fb8d4a73b99b9f11d75a5342b6.tar.gz
historical-eba550b1026870fb8d4a73b99b9f11d75a5342b6.tar.bz2
historical-eba550b1026870fb8d4a73b99b9f11d75a5342b6.zip
fixed gfs mounting. Closed bug #93903.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'sys-fs/gfs')
-rw-r--r--sys-fs/gfs/ChangeLog5
-rw-r--r--sys-fs/gfs/Manifest12
-rwxr-xr-xsys-fs/gfs/files/gfs.rc6
3 files changed, 13 insertions, 10 deletions
diff --git a/sys-fs/gfs/ChangeLog b/sys-fs/gfs/ChangeLog
index 3e92c55061fc..1c713d1602fe 100644
--- a/sys-fs/gfs/ChangeLog
+++ b/sys-fs/gfs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-fs/gfs
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.9 2005/03/26 14:39:09 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.10 2005/06/14 09:46:46 xmerlin Exp $
+
+ 14 Jun 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gfs.rc:
+ fixed gfs mounting. Closed bug #93903.
26 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gfs.rc:
fixed regexp in init
diff --git a/sys-fs/gfs/Manifest b/sys-fs/gfs/Manifest
index 8c1143a0ce58..b44089868edc 100644
--- a/sys-fs/gfs/Manifest
+++ b/sys-fs/gfs/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 09ac7d09d9162886936bcc3724e60fbb ChangeLog 1441
+MD5 540a304de4edcecfb3a3f901740cecc1 ChangeLog 1552
MD5 e532bae4d160bb24ffb1b896b8d2f15e gfs-6.1_pre21.ebuild 1083
MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
MD5 8b61a396206c23d7fb8e1adad649f8b7 files/digest-gfs-6.1_pre21 65
-MD5 90762096eb6d64561abee3c6646e0be4 files/gfs.rc 4391
+MD5 9ef03ae8f41068bd322723b0db416f58 files/gfs.rc 4401
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFCRX13gMUyd/cdjWsRApyOAJ45jvNs6MCo6Mo1jb3tsvqOgXgFCgCeI0rb
-yEg9Fx7+MdvbUlnYRx86PFk=
-=OcrM
+iD8DBQFCrqewgMUyd/cdjWsRAospAJ9KVEDSNWi0mREsVVYxwpNw1rWeHQCeM8Vs
+10DsEqAj7LsMRJTDw1j1mDg=
+=53v8
-----END PGP SIGNATURE-----
diff --git a/sys-fs/gfs/files/gfs.rc b/sys-fs/gfs/files/gfs.rc
index 43015cec417c..601ee540b574 100755
--- a/sys-fs/gfs/files/gfs.rc
+++ b/sys-fs/gfs/files/gfs.rc
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/files/gfs.rc,v 1.6 2005/03/26 14:39:09 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/files/gfs.rc,v 1.7 2005/06/14 09:46:46 xmerlin Exp $
opts="${opts} mountall"
@@ -48,8 +48,8 @@ mount_gfs_filesystems() {
einfo "Mounting GFS filesystems"
device=""
for device in ${remaining_verified}; do
- local target="$(awk '!/^#/ && $3 == "gfs" { if ("$1" -eq "${device}" ) print $2 }' /etc/fstab)"
- local mounted="$(awk '$3 == "gfs" { if ("$1" -eq "${device}" ) print $2 }' /proc/mounts)"
+ local target="$(awk '!/^#/ && $3 == "gfs" && $1 == device { print $2 }' device=${device} /etc/fstab)"
+ local mounted="$(awk '$3 == "gfs" && $1 == device { print $2 }' device=${device} /proc/mounts)"
# mount only filesystems not already mounted
if [ -z "${mounted}" ]; then