diff options
| author |   Christian Zoffoli <xmerlin@gentoo.org> | 2008-03-17 23:24:24 +0000 |
|---|---|---|
| committer | Christian Zoffoli <xmerlin@gentoo.org> | 2008-03-17 23:24:24 +0000 |
| commit | 4eb44a80302365452a3d357fac48020c5d916fac (patch) | |
| tree | b8b4c62ee1cfd6b42d30238fc766a97d7bb63f95 /sys-fs | |
| parent | Version bump, updating translation scheme to work with xkeyboard-config-1.2. ... (diff) | |
| download | gentoo-2-4eb44a80302365452a3d357fac48020c5d916fac.tar.gz gentoo-2-4eb44a80302365452a3d357fac48020c5d916fac.tar.bz2 gentoo-2-4eb44a80302365452a3d357fac48020c5d916fac.zip | |
Fixed bug #209267, now gfs init script honours options in fstab.
(Portage version: 2.1.4.4)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/gfs/ChangeLog | 5 | ||||
| -rwxr-xr-x | sys-fs/gfs/files/gfs-2.0x.rc | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-fs/gfs/ChangeLog b/sys-fs/gfs/ChangeLog index bf3e6c15439b..989dae1f25a2 100644 --- a/sys-fs/gfs/ChangeLog +++ b/sys-fs/gfs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/gfs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.30 2008/03/17 17:30:28 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.31 2008/03/17 23:24:23 xmerlin Exp $ + + 17 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> files/gfs-2.0x.rc: + Fixed bug #209267, now gfs init script honours options in fstab. *gfs-2.02.00 (17 Mar 2008) diff --git a/sys-fs/gfs/files/gfs-2.0x.rc b/sys-fs/gfs/files/gfs-2.0x.rc index 330e288778c6..574afb828285 100755 --- a/sys-fs/gfs/files/gfs-2.0x.rc +++ b/sys-fs/gfs/files/gfs-2.0x.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2008 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-2.0x.rc,v 1.1 2008/03/17 17:30:29 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/files/gfs-2.0x.rc,v 1.2 2008/03/17 23:24:24 xmerlin Exp $ opts="${opts} mountall" @@ -49,11 +49,12 @@ mount_gfs_filesystems() { for device in ${remaining_verified}; do 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)" + local options="$(awk '!/^#/ && $3 == "gfs" && $1 == device { print $4 }' device=${device} /etc/fstab)" # mount only filesystems not already mounted if [ -z "${mounted}" ]; then ebegin "--> mounting ${device} on ${target}" - mount -t gfs ${device} ${target} >/dev/null + mount -t gfs ${device} ${target} -o ${options} >/dev/null eend $? else einfo "--> ${device} already mounted on ${target}" |