diff options
Diffstat (limited to 'sys-fs/gfs')
| -rw-r--r-- | sys-fs/gfs/ChangeLog | 5 | ||||
| -rwxr-xr-x | sys-fs/gfs/files/gfs-2.0x.rc | 26 |
2 files changed, 7 insertions, 24 deletions
diff --git a/sys-fs/gfs/ChangeLog b/sys-fs/gfs/ChangeLog index 989dae1f25a2..ad2197eb54e3 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.31 2008/03/17 23:24:23 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.32 2008/03/21 11:59:51 xmerlin Exp $ + + 21 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> files/gfs-2.0x.rc: + Removed gulm from the init script, now it's deprecated. 17 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> files/gfs-2.0x.rc: Fixed bug #209267, now gfs init script honours options in fstab. diff --git a/sys-fs/gfs/files/gfs-2.0x.rc b/sys-fs/gfs/files/gfs-2.0x.rc index 574afb828285..d1604a2bb972 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.2 2008/03/17 23:24:24 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/files/gfs-2.0x.rc,v 1.3 2008/03/21 11:59:52 xmerlin Exp $ opts="${opts} mountall" @@ -121,35 +121,15 @@ unload_modules() { } load_gfs_modules() { - local modules - - # detect cluster/locking manager cman+dlm or gulm ? - if [ -d /proc/cluster/config/cman ]; then - if [ ! -d /proc/cluster/lock_dlm ]; then - modules="${modules} lock_dlm" - fi - else - if [ ! -d /proc/cluster/lock_gulm ]; then - modules="${modules} lock_gulm" - fi - fi if [ ! -f /proc/fs/gfs ]; then - modules="${modules} gfs" + load_modules gfs fi - load_modules ${modules} } unload_gfs_modules() { if [ -f /proc/fs/gfs ]; then - modules="gfs lock_harness" - fi - if [ -d /proc/cluster/lock_dlm ]; then - modules="${modules} lock_dlm" - fi - if [ -d /proc/cluster/lock_gulm ]; then - modules="${modules} lock_gulm" + unload_modules gfs fi - unload_modules ${modules} } mountall() { |