diff options
| author | Benjamin Marzinski <bmarzins@redhat.com> | 2012-01-24 10:35:54 -0600 |
|---|---|---|
| committer | Benjamin Marzinski <bmarzins@redhat.com> | 2012-01-24 10:35:54 -0600 |
| commit | a1478bc1bcf95fdd3feae2e0405b135ff4cc7954 (patch) | |
| tree | 93e2e38a1eca0fc42a77cc3c3c9c243dc4724a68 /0003-RH-root-init-script.patch | |
| parent | 8d4103df73b8946c3ec54449737e84e21db9ce63 (diff) | |
Updated to latest upstream 0.4.9 code : multipath-tools-120123.tgz
(git commit id: 63704387009443bdb37d9deaaafa9ab121d45bfb)
Add 0001-RH-fix-async-tur.patch
Add 0002-RH-dont_start_with_no_config.patch
Add 0003-RH-multipath.rules.patch
Add 0004-RH-update-init-script.patch
Add 0005-RH-cciss_id.patch
Add 0006-RH-Make-build-system-RH-Fedora-friendly.patch
Add 0007-RH-multipathd-blacklist-all-by-default.patch
Add 0008-RH-add-mpathconf.patch
Add 0009-RH-add-find-multipaths.patch
Add 0010-RH-check-if-multipath-owns-path.patch
Add 0011-RH-add-hp_tur-checker.patch
Diffstat (limited to '0003-RH-root-init-script.patch')
| -rw-r--r-- | 0003-RH-root-init-script.patch | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/0003-RH-root-init-script.patch b/0003-RH-root-init-script.patch deleted file mode 100644 index c687537..0000000 --- a/0003-RH-root-init-script.patch +++ /dev/null @@ -1,84 +0,0 @@ -From e6a23cc9de85a66d774567515592bdbdba7b2ca4 Mon Sep 17 00:00:00 2001 -From: Fabio M. Di Nitto <fdinitto@redhat.com> -Date: Tue, 13 Oct 2009 08:19:01 +0200 -Subject: [PATCH 03/12] RH: root init script - -Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> ---- -:100644 100644 ee776f0... e46b1b8... M multipathd/multipathd.init.redhat - multipathd/multipathd.init.redhat | 38 ++++++++++++++++++++++++++++++++++++- - 1 files changed, 37 insertions(+), 1 deletions(-) - -diff --git a/multipathd/multipathd.init.redhat b/multipathd/multipathd.init.redhat -index ee776f0..e46b1b8 100644 ---- a/multipathd/multipathd.init.redhat -+++ b/multipathd/multipathd.init.redhat -@@ -2,7 +2,7 @@ - # - # multipathd Starts the multipath daemon - # --# chkconfig: - 13 87 -+# chkconfig: - 06 87 - # description: Manages device-mapper multipath devices - - ### BEGIN INIT INFO -@@ -17,6 +17,7 @@ prog=`basename $DAEMON` - initdir=/etc/rc.d/init.d - lockdir=/var/lock/subsys - sysconfig=/etc/sysconfig -+syspath=/sys/block - - - . $initdir/functions -@@ -25,6 +26,36 @@ test -r $sysconfig/$prog && . $sysconfig/$prog - - RETVAL=0 - -+teardown_slaves() -+{ -+pushd $1 > /dev/null -+if [ -d "slaves" ]; then -+for slave in slaves/*; -+do -+ if [ "$slave" = "slaves/*" ]; then -+ read dev < $1/dev -+ tablename=`dmsetup table --target multipath | sed -n "s/\(.*\): .* $dev .*/\1/p"` -+ if ! [ -z $tablename ]; then -+ echo "Root is on a multipathed device, multipathd can not be stopped" -+ exit 1 -+ fi -+ else -+ local_slave=`readlink -f $slave`; -+ teardown_slaves $local_slave; -+ fi -+ done -+ -+else -+ read dev < $1/dev -+ tablename=`dmsetup table --target multipath | sed -n "s/\(.*\): .* $dev .*/\1/p"` -+ if ! [ -z $tablename ]; then -+ echo "Root is on a multipathed device, multipathd can not be stopped" -+ exit 1 -+ fi -+fi -+popd > /dev/null -+} -+ - # - # See how we were called. - # -@@ -39,6 +70,11 @@ start() { - } - - stop() { -+ root_dev=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/mtab) -+ dm_num=`dmsetup info -c --noheadings -o minor $root_dev` -+ root_dm_device="dm-$dm_num" -+ [ -d $syspath/$root_dm_device ] && teardown_slaves $syspath/$root_dm_device -+ - echo -n $"Stopping $prog daemon: " - killproc $DAEMON - RETVAL=$? --- -1.6.5.1 - |