summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Zoffoli <xmerlin@gentoo.org>2005-03-23 14:40:35 +0000
committerChristian Zoffoli <xmerlin@gentoo.org>2005-03-23 14:40:35 +0000
commit72914a074224ece0521e6f519c05248b78c8c7e4 (patch)
tree64857151f339ea8f90f50566ccee32f8d3a83988 /sys-cluster/gnbd
parentadded lock_dlm module unload in init (diff)
downloadgentoo-2-72914a074224ece0521e6f519c05248b78c8c7e4.tar.gz
gentoo-2-72914a074224ece0521e6f519c05248b78c8c7e4.tar.bz2
gentoo-2-72914a074224ece0521e6f519c05248b78c8c7e4.zip
added gfs filesystems (imported GNBSs) umount in init
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-cluster/gnbd')
-rw-r--r--sys-cluster/gnbd/ChangeLog5
-rwxr-xr-xsys-cluster/gnbd/files/gnbd-client.rc8
2 files changed, 8 insertions, 5 deletions
diff --git a/sys-cluster/gnbd/ChangeLog b/sys-cluster/gnbd/ChangeLog
index 3b090ac51f91..e7d6c79e95d2 100644
--- a/sys-cluster/gnbd/ChangeLog
+++ b/sys-cluster/gnbd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-cluster/gnbd
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/ChangeLog,v 1.2 2005/03/23 14:09:48 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/ChangeLog,v 1.3 2005/03/23 14:40:35 xmerlin Exp $
+
+ 23 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gnbd-client.rc:
+ added gfs filesystems (imported GNBSs) umount in init
23 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gnbd-client.rc:
added unmounting gfs capability to gnbd-client script
diff --git a/sys-cluster/gnbd/files/gnbd-client.rc b/sys-cluster/gnbd/files/gnbd-client.rc
index 12ae6cb637c5..6af0a4463a46 100755
--- a/sys-cluster/gnbd/files/gnbd-client.rc
+++ b/sys-cluster/gnbd/files/gnbd-client.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-cluster/gnbd/files/gnbd-client.rc,v 1.2 2005/03/23 14:09:48 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/files/gnbd-client.rc,v 1.3 2005/03/23 14:40:35 xmerlin Exp $
depend() {
use dns logger
@@ -32,11 +32,11 @@ start() {
stop() {
local sig retry
- local remaining="$(awk '$3 ~ /gfs/ && $1 ~ /\/dev\/gnbd\// { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
+ local remaining="$(awk '$3 ~ /gfs/ { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
if [ -z "${remaining}" ]
then
- ebegin "Unmounting GFS filesystems (GNBDs imported devices)"
+ ebegin "Unmounting GFS filesystems"
eend 0
else
sig=
@@ -53,7 +53,7 @@ stop() {
umount ${remaining} &>/dev/null
eend $? "Failed to unmount GFS filesystems"
fi
- remaining="$(awk '$3 ~ /gfs/ && $1 ~ /\/dev\/gnbd\// { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
+ remaining="$(awk '$3 ~ /gfs/ { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
[ -z "${remaining}" ] && break
/bin/fuser -k -m ${sig} ${remaining} &>/dev/null
sleep 5