Remove old initscripts

Package-Manager: portage-2.1.10.45/cvs/Linux x86_64

7 files changed, 7 insertions, 480 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index ee99400fc49c..41b34ad89029 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.147 2012/02/09 16:13:05 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.148 2012/02/09 18:36:38 cardoe Exp $
+
+  09 Feb 2012; Doug Goldstein <cardoe@gentoo.org> -files/libvirtd.confd-r1,
+  -files/libvirtd.init-r1, -files/libvirtd.init-r2, -files/libvirtd.init-r3,
+  -files/libvirtd.init-r4:
+  Remove old initscripts
 
   09 Feb 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.8.ebuild,
   libvirt-9999.ebuild:
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index f87e5f9f87c9..cf79920e1811 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,9 +1,4 @@
-AUX libvirtd.confd-r1 1248 RMD160 ebd5f28c671f2d26e9ff5d4879f959c11d72d7e3 SHA1 4789a80343f06b535d6bc27ef4206704c548c078 SHA256 851ab3f9678f0fa9c3ee03f7fc7bd00c4ee86d5f0777eecf9eb1ffe3243adfd1
 AUX libvirtd.confd-r2 1749 RMD160 30c662b9a14a3dc635674d0aee6452076da60102 SHA1 ae7a2b801ca0f9f610c015eb0fe06640596ac614 SHA256 93040599a7cb878b54b8b963ef4963e9450bc25e982e390cef3e5b7e8039757c
-AUX libvirtd.init-r1 2558 RMD160 d87b527e9917ef926045fa07e809dc4527f04af7 SHA1 b483a176d650cbf80d64d8da2b5165f62fc23e7f SHA256 03020823683a3374f05a0a45e023037433b2b6fc4c7c8d52ed90f61f3d3f5b7b
-AUX libvirtd.init-r2 3407 RMD160 9a5cf8a0d3bc4097871d8cf1581fc5a858e22abd SHA1 79e3d9848f03f66fc3bd5c438231a84b1bf3588e SHA256 8fb9a912cdf4974cfa7d23762468f67b5b2ef74620ce0c7270c72b4a8a691eef
-AUX libvirtd.init-r3 3319 RMD160 c28af7ed59542ce643035bc61a4a64a0b2a48296 SHA1 12a98743f532a7bab0ecbf7a993d9413bfe0220d SHA256 f0d4ea1125c8c3f02adae1c1d918ff3f393009f867aedb678ccb1dbb9babbb88
-AUX libvirtd.init-r4 3365 RMD160 01b6dc11c4baa541ab933a69a85e6d314a8aa041 SHA1 91a429edc6f3497b0da2e99757063ad0cf5407e1 SHA256 19ad0a49dc774d9dc06ce196b932cf8fad2875a2b46919564eefef2810b47100
 AUX libvirtd.init-r5 3572 RMD160 2899a3bc515856642eb6f0cfe6d0944454271460 SHA1 ea541974fb672621c3d75020bfa8ec4be77066e1 SHA256 6c04449123ebb5d5736e53a81325f66a0db52cc19c7a6c80ba5f599a3687569f
 DIST libvirt-0.9.6.tar.gz 17326676 RMD160 5e0837e8ee770e017e574fd002e9e489e448ca65 SHA1 9fd108e1a351d191c5d7f89458096fb35bd6413e SHA256 ce29b1cd3067b224aa834fec2a93d7613c0e72bc035760ad536a2142430bc02b
 DIST libvirt-0.9.7.tar.gz 17853636 RMD160 d5a9e7461fc2c487aadf7e8955a213252edd1e2e SHA1 2f08609267154ad5377b3dc3952eb1e77469b570 SHA256 29ff05bfe5177d6680c02c279ed2573dcfae993f2824bffa192a3a2cdd05af23
@@ -12,5 +7,5 @@ EBUILD libvirt-0.9.6.ebuild 7890 RMD160 873b7e5ca67de2d4d37b8900bc25278e1dd73ef8
 EBUILD libvirt-0.9.7.ebuild 7905 RMD160 d659d88773d88741f13e103b98565bbdd99098f8 SHA1 ad76511e270cabf438eeda22fb5513d91014ae6c SHA256 861006d4ff5ab4375ca1806b0ff8912095e7af501fcf2fcf6f0e781507f49892
 EBUILD libvirt-0.9.8.ebuild 7963 RMD160 b35597ec8269883edac8717747e55fd98cd5523a SHA1 7cacecde9958afa83e797289b282a2ef1ba921ce SHA256 1314b2f45c3821383a75f74a888cc152de8335454754d50e13c3945c6edfdd3b
 EBUILD libvirt-9999.ebuild 7963 RMD160 4d473e030ad5dad83da760e6de1edf607a6332b1 SHA1 f632a5e49275204ec4f1f5ae9e03ce58c5993ab3 SHA256 cd3141ec735a4038fb72e1a20fb12d0a44dd4d88c44355454e15ce7b4d344c40
-MISC ChangeLog 30404 RMD160 1473f20fa93d60fe0b12d302fb0af500f66be646 SHA1 0eca746c345b773398eee4fe245c0c5130ff9f3b SHA256 c8e90174c7475aee756024bcecd2dd14d912ad31cd3f59e638524637c28a091c
+MISC ChangeLog 30610 RMD160 8d8e8686966f5209a4b783ee0e5971d967e8332f SHA1 d7f2dd40cc17e89a5fa32586b1f8f0b1628d4203 SHA256 057adf3a5c8f3f5d979710935a76b2f74dd9ea48cf8b134d21e38cea23ca438f
 MISC metadata.xml 3132 RMD160 066870c02fd835f9a633b69328367737d4cc0b71 SHA1 940cc910ef4d1a75947afef95d73a3026bb91527 SHA256 e0eb882799f41f51c9930a1142cf5427061bdacf629a028ac4e8b65c1cf67ea4
diff --git a/app-emulation/libvirt/files/libvirtd.confd-r1 b/app-emulation/libvirt/files/libvirtd.confd-r1
deleted file mode 100644
index d51bdb99d1fd..000000000000
--- a/app-emulation/libvirt/files/libvirtd.confd-r1
+++ /dev/null
@@ -1,27 +0,0 @@
-# /etc/conf.d/libvirtd
-
-# You may want to add '--listen' to have libvirtd listen for tcp/ip connections
-# if you want to use libvirt for remote control
-
-# Please consult 'libvirtd --help' for more options
-
-#LIBVIRTD_OPTS="--listen"
-
-# Valid options:
-# * shutdown - Sends an ACPI shutdown (think when you tap the power button
-# 				on your machine and it begins a graceful shutdown). If your
-# 				VM ignores this, it will have the power yanked out from under
-# 				it in LIBVIRTD_KVM_SHUTDOWN_MAXWAIT seconds.
-# * managedsave - Performs a state save external to the VM. qemu-kvm will stop
-# 				stop the CPU and save off all state to a separate file. When
-# 				the machine is started again, it will resume like nothing ever
-# 				happened. This is guarenteed to always successfully stop your
-# 				machine and restart it. However it may take some time to finish.
-# * none - No attempts will be made to stop any VMs. If you are restarting your
-# 		machine the qemu-kvm process will be simply killed, which may result
-# 		in your VMs having disk corruption.
-LIBVIRTD_KVM_SHUTDOWN="managedsave"
-
-# Timeout in seconds until stopping libvirtd and "pulling the plug" on the
-# remaining VM's still in a running state
-#LIBVIRTD_KVM_SHUTDOWN_MAXWAIT="500"
diff --git a/app-emulation/libvirt/files/libvirtd.init-r1 b/app-emulation/libvirt/files/libvirtd.init-r1
deleted file mode 100644
index 22d8a03b7b42..000000000000
--- a/app-emulation/libvirt/files/libvirtd.init-r1
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/runscript
-
-opts="start stop status reload restart"
-
-depend() {
-    need net
-    before sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
-}
-
-libvirtd_virsh() {
-    # Silence errors because virsh always throws an error about
-    # not finding the hypervisor version when connecting to libvirtd
-    LC_ALL=C virsh -c qemu:///system "$@" 2>/dev/null
-}
-
-libvirtd_dom_list() {
-    # Make sure that it wouldn't be confused if the domain name
-    # contains the word running.
-    libvirtd_virsh list | awk '$3 == "running" { print $1 }'
-}
-
-libvirtd_dom_count() {
-    # Make sure that it wouldn't be confused if the domain name
-    # contains the word running.
-    libvirtd_virsh list | awk 'BEGIN { count = 0 } \
-		$3 == "running" { count++ } \
-		END { print count }'
-}
-
-start() {
-    ebegin "Starting libvirtd"
-    start-stop-daemon --start \
-        --env KRB5_KTNAME=/etc/libvirt/krb5.tab \
-        --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping libvirtd"
-    # try to shutdown all (KVM/Qemu) domains
-    DOM_COUNT="$(libvirtd_dom_count)"
-    if [ "${LIBVIRTD_KVM_SHUTDOWN}" != "none" ] \
-        && [ "${DOM_COUNT}" != "0" ] ; then
-
-        einfo " Shutting down domain(s):"
-        for DOM_ID in $(libvirtd_dom_list) ; do
-            NAME="$(libvirtd_virsh domname ${DOM_ID} | head -n 1)"
-            einfo "   ${NAME}"
-            libvirtd_virsh ${LIBVIRTD_KVM_SHUTDOWN} ${DOM_ID} > /dev/null
-        done
-
-        if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then
-            COUNTER="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}"
-        else
-            COUNTER=500
-        fi
-
-		if [ "${LIBVIRTD_KVM_SHUTDOWN}" = "shutdown" ]; then
-			einfo " Waiting ${COUNTER} seconds while domains shutdown ..."
-			DOM_COUNT="$(libvirtd_dom_count)"
-			while [ ${DOM_COUNT} -gt 0 ] && [ ${COUNTER} -gt 0 ] ; do
-				DOM_COUNT="$(libvirtd_dom_count)"
-					sleep 1
-					COUNTER=$((${COUNTER} - 1))
-					echo -n "."
-			done
-		fi
-
-        DOM_COUNT="$(libvirtd_dom_count)"
-        if [ "${DOM_COUNT}" != "0" ] ; then
-            eerror " !!! Some guests are still running, stopping anyways"
-        fi
-
-    fi
-    start-stop-daemon --stop --quiet --exec /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
-    eend $?
-}
-
-reload() {
-    ebegin "Reloading libvirtd without shutting down your VMs"
-    start-stop-daemon --stop --quiet --exec /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
-	if [ $? -ne 0 ]; then
-		eend $?
-	fi
-    start-stop-daemon --start --quiet --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
-    eend $?
-}
diff --git a/app-emulation/libvirt/files/libvirtd.init-r2 b/app-emulation/libvirt/files/libvirtd.init-r2
deleted file mode 100755
index 2d10ed2eabc6..000000000000
--- a/app-emulation/libvirt/files/libvirtd.init-r2
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/sbin/runscript
-
-opts="start stop status reload restart"
-
-depend() {
-    need net
-    before sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
-}
-
-libvirtd_virsh() {
-    # Silence errors because virsh always throws an error about
-    # not finding the hypervisor version when connecting to libvirtd
-    LC_ALL=C virsh -c qemu:///system "$@" 2>/dev/null
-}
-
-libvirtd_dom_list() {
-    # Make sure that it wouldn't be confused if the domain name
-    # contains the word running.
-    libvirtd_virsh list | awk '$3 == "running" { print $1 }'
-}
-
-libvirtd_dom_count() {
-    # Make sure that it wouldn't be confused if the domain name
-    # contains the word running.
-    libvirtd_virsh list | awk 'BEGIN { count = 0 } \
-		$3 == "running" { count++ } \
-		END { print count }'
-}
-
-libvirtd_net_list() {
-	# The purpose of the awk is to avoid networks with 'active' in the name
-	libvirtd_virsh net-list | awk '$2 == "active" { print $1 }'
-}
-
-libvirtd_net_count() {
-	# The purpose of the awk is to avoid networks with 'active' in the name
-	libvirtd_virsh net-list | awk 'BEGIN { count = 0 } \
-		$2 == "active" { count++ } \
-		END { print count }'
-}
-
-
-start() {
-    ebegin "Starting libvirtd"
-    start-stop-daemon --start \
-        --env KRB5_KTNAME=/etc/libvirt/krb5.tab \
-        --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping libvirtd"
-    # try to shutdown all (KVM/Qemu) domains
-    DOM_COUNT="$(libvirtd_dom_count)"
-    if [ "${LIBVIRTD_KVM_SHUTDOWN}" != "none" ] \
-        && [ "${DOM_COUNT}" != "0" ] ; then
-
-        einfo " Shutting down domain(s):"
-        for DOM_ID in $(libvirtd_dom_list) ; do
-            NAME="$(libvirtd_virsh domname ${DOM_ID} | head -n 1)"
-            einfo "   ${NAME}"
-            libvirtd_virsh ${LIBVIRTD_KVM_SHUTDOWN} ${DOM_ID} > /dev/null
-        done
-
-        if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then
-            COUNTER="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}"
-        else
-            COUNTER=500
-        fi
-
-		if [ "${LIBVIRTD_KVM_SHUTDOWN}" = "shutdown" ]; then
-			einfo " Waiting ${COUNTER} seconds while domains shutdown ..."
-			DOM_COUNT="$(libvirtd_dom_count)"
-			while [ ${DOM_COUNT} -gt 0 ] && [ ${COUNTER} -gt 0 ] ; do
-				DOM_COUNT="$(libvirtd_dom_count)"
-					sleep 1
-					COUNTER=$((${COUNTER} - 1))
-					echo -n "."
-			done
-		fi
-
-        DOM_COUNT="$(libvirtd_dom_count)"
-        if [ "${DOM_COUNT}" != "0" ] ; then
-            eerror " !!! Some guests are still running, stopping anyway"
-        fi
-
-    fi
-
-	NET_COUNT="$(libvirtd_net_count)"
-	if [ "${LIBVIRTD_NET_SHUTDOWN}" != "no" ] \
-		&& [ "${NET_COUNT}" != "0" ]; then
-
-		einfo " Shutting down network(s):"
-			for NET_NAME in $(libvirtd_net_list); do
-				einfo "   ${NET_NAME}"
-				libvirtd_virsh net-destroy ${NET_NAME} > /dev/null
-			done
-
-		NET_COUNT="$(libvirtd_net_count)"
-		if [ "${NET_COUNT}" != "0" ]; then
-			eerror " !!! Some networks are still active, stopping anyway"
-		fi
-	fi
-
-	# Now actually stop the daemon
-    start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
-    eend $?
-}
-
-reload() {
-    ebegin "Reloading libvirtd without shutting down your VMs"
-    start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
-	if [ $? -ne 0 ]; then
-		eend $?
-	fi
-    start-stop-daemon --start --quiet --exec \
-		/usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
-    eend $?
-}
diff --git a/app-emulation/libvirt/files/libvirtd.init-r3 b/app-emulation/libvirt/files/libvirtd.init-r3
deleted file mode 100755
index 87f2e87d64d8..000000000000
--- a/app-emulation/libvirt/files/libvirtd.init-r3
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/sbin/runscript
-
-opts="start stop status reload restart"
-
-depend() {
-    need net
-    before sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
-}
-
-libvirtd_virsh() {
-    # Silence errors because virsh always throws an error about
-    # not finding the hypervisor version when connecting to libvirtd
-    LC_ALL=C virsh -c qemu:///system "$@" 2>/dev/null
-}
-
-libvirtd_dom_list() {
-    # Make sure that it wouldn't be confused if the domain name
-    # contains the word running.
-    libvirtd_virsh list | awk '$3 == "running" { print $1 }'
-}
-
-libvirtd_dom_count() {
-    # Make sure that it wouldn't be confused if the domain name
-    # contains the word running.
-    libvirtd_virsh list | awk 'BEGIN { count = 0 } \
-		$3 == "running" { count++ } \
-		END { print count }'
-}
-
-libvirtd_net_list() {
-	# The purpose of the awk is to avoid networks with 'active' in the name
-	libvirtd_virsh net-list | awk '$2 == "active" { print $1 }'
-}
-
-libvirtd_net_count() {
-	# The purpose of the awk is to avoid networks with 'active' in the name
-	libvirtd_virsh net-list | awk 'BEGIN { count = 0 } \
-		$2 == "active" { count++ } \
-		END { print count }'
-}
-
-
-start() {
-    ebegin "Starting libvirtd"
-    start-stop-daemon --start \
-        --env KRB5_KTNAME=/etc/libvirt/krb5.tab \
-        --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping libvirtd"
-    # try to shutdown all (KVM/Qemu) domains
-    DOM_COUNT="$(libvirtd_dom_count)"
-    if [ "${LIBVIRTD_KVM_SHUTDOWN}" != "none" ] \
-        && [ "${DOM_COUNT}" != "0" ] ; then
-
-        einfo " Shutting down domain(s):"
-        for DOM_ID in $(libvirtd_dom_list) ; do
-            NAME="$(libvirtd_virsh domname ${DOM_ID} | head -n 1)"
-            einfo "   ${NAME}"
-            libvirtd_virsh ${LIBVIRTD_KVM_SHUTDOWN} ${DOM_ID} > /dev/null
-        done
-
-        if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then
-            COUNTER="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}"
-        else
-            COUNTER=500
-        fi
-
-		if [ "${LIBVIRTD_KVM_SHUTDOWN}" = "shutdown" ]; then
-			einfo " Waiting ${COUNTER} seconds while domains shutdown ..."
-			DOM_COUNT="$(libvirtd_dom_count)"
-			while [ ${DOM_COUNT} -gt 0 ] && [ ${COUNTER} -gt 0 ] ; do
-				DOM_COUNT="$(libvirtd_dom_count)"
-					sleep 1
-					COUNTER=$((${COUNTER} - 1))
-					echo -n "."
-			done
-		fi
-
-        DOM_COUNT="$(libvirtd_dom_count)"
-        if [ "${DOM_COUNT}" != "0" ] ; then
-            eerror " !!! Some guests are still running, stopping anyway"
-        fi
-
-    fi
-
-	NET_COUNT="$(libvirtd_net_count)"
-	if [ "${LIBVIRTD_NET_SHUTDOWN}" != "no" ] \
-		&& [ "${NET_COUNT}" != "0" ]; then
-
-		einfo " Shutting down network(s):"
-			for NET_NAME in $(libvirtd_net_list); do
-				einfo "   ${NET_NAME}"
-				libvirtd_virsh net-destroy ${NET_NAME} > /dev/null
-			done
-
-		NET_COUNT="$(libvirtd_net_count)"
-		if [ "${NET_COUNT}" != "0" ]; then
-			eerror " !!! Some networks are still active, stopping anyway"
-		fi
-	fi
-
-	# Now actually stop the daemon
-    start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
-    eend $?
-}
-
-reload() {
-    ebegin "Stopping libvirtd without shutting down your VMs"
-    start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
-	eend $?
-
-	# Call the original start function
-	start
-}
diff --git a/app-emulation/libvirt/files/libvirtd.init-r4 b/app-emulation/libvirt/files/libvirtd.init-r4
deleted file mode 100755
index 9e185132000f..000000000000
--- a/app-emulation/libvirt/files/libvirtd.init-r4
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/sbin/runscript
-
-opts="start stop status reload restart"
-
-depend() {
-    need net
-	after ntp-client ntpd nfs iscsid nfsmount portmap rpc.statd iptables ip6tables ebtables ceph corosync sanlock
-}
-
-libvirtd_virsh() {
-    # Silence errors because virsh always throws an error about
-    # not finding the hypervisor version when connecting to libvirtd
-    LC_ALL=C virsh -c qemu:///system "$@" 2>/dev/null
-}
-
-libvirtd_dom_list() {
-    # Make sure that it wouldn't be confused if the domain name
-    # contains the word running.
-    libvirtd_virsh list | awk '$3 == "running" { print $1 }'
-}
-
-libvirtd_dom_count() {
-    # Make sure that it wouldn't be confused if the domain name
-    # contains the word running.
-    libvirtd_virsh list | awk 'BEGIN { count = 0 } \
-		$3 == "running" { count++ } \
-		END { print count }'
-}
-
-libvirtd_net_list() {
-	# The purpose of the awk is to avoid networks with 'active' in the name
-	libvirtd_virsh net-list | awk '$2 == "active" { print $1 }'
-}
-
-libvirtd_net_count() {
-	# The purpose of the awk is to avoid networks with 'active' in the name
-	libvirtd_virsh net-list | awk 'BEGIN { count = 0 } \
-		$2 == "active" { count++ } \
-		END { print count }'
-}
-
-
-start() {
-    ebegin "Starting libvirtd"
-    start-stop-daemon --start \
-        --env KRB5_KTNAME=/etc/libvirt/krb5.tab \
-        --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping libvirtd"
-    # try to shutdown all (KVM/Qemu) domains
-    DOM_COUNT="$(libvirtd_dom_count)"
-    if [ "${LIBVIRTD_KVM_SHUTDOWN}" != "none" ] \
-        && [ "${DOM_COUNT}" != "0" ] ; then
-
-        einfo " Shutting down domain(s):"
-        for DOM_ID in $(libvirtd_dom_list) ; do
-            NAME="$(libvirtd_virsh domname ${DOM_ID} | head -n 1)"
-            einfo "   ${NAME}"
-            libvirtd_virsh ${LIBVIRTD_KVM_SHUTDOWN} ${DOM_ID} > /dev/null
-        done
-
-        if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then
-            COUNTER="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}"
-        else
-            COUNTER=500
-        fi
-
-		if [ "${LIBVIRTD_KVM_SHUTDOWN}" = "shutdown" ]; then
-			einfo " Waiting ${COUNTER} seconds while domains shutdown ..."
-			DOM_COUNT="$(libvirtd_dom_count)"
-			while [ ${DOM_COUNT} -gt 0 ] && [ ${COUNTER} -gt 0 ] ; do
-				DOM_COUNT="$(libvirtd_dom_count)"
-					sleep 1
-					COUNTER=$((${COUNTER} - 1))
-					echo -n "."
-			done
-		fi
-
-        DOM_COUNT="$(libvirtd_dom_count)"
-        if [ "${DOM_COUNT}" != "0" ] ; then
-            eerror " !!! Some guests are still running, stopping anyway"
-        fi
-
-    fi
-
-	NET_COUNT="$(libvirtd_net_count)"
-	if [ "${LIBVIRTD_NET_SHUTDOWN}" != "no" ] \
-		&& [ "${NET_COUNT}" != "0" ]; then
-
-		einfo " Shutting down network(s):"
-			for NET_NAME in $(libvirtd_net_list); do
-				einfo "   ${NET_NAME}"
-				libvirtd_virsh net-destroy ${NET_NAME} > /dev/null
-			done
-
-		NET_COUNT="$(libvirtd_net_count)"
-		if [ "${NET_COUNT}" != "0" ]; then
-			eerror " !!! Some networks are still active, stopping anyway"
-		fi
-	fi
-
-	# Now actually stop the daemon
-    start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
-    eend $?
-}
-
-reload() {
-    ebegin "Stopping libvirtd without shutting down your VMs"
-    start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
-	eend $?
-
-	# Call the original start function
-	start
-}