tools/hotplug: remove 4 from default runlevel in init scripts

Remove 4 from default runlevel in xen-watchdog, xend and xendomains.

Similar to what changeset 24847:0900b1c905f1 does in xencommons, remove
runlevel 4 from the other runlevel scripts. LSB defines runlevel 4 as
reserved for local use, the local sysadmin is responsible for symlink
creation in rc4.d.

Runlevel 4 was specified in Default-Start since a very long time. Then
it was copied also to the new xen-watchdog in 21861:fb3649141e19. Until
now this was not an issue since only xencommons is automatically enabled
during package install, and a custom xend and xendomains script is
included in the SuSE packages. Since some time a rpmlint check complains
about the wrong Default-Start entry in xen-watchdog.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Committed-by: Ian Jackson <ian.jackson.citrix.com>

diff --git a/tools/hotplug/Linux/init.d/xen-watchdog b/tools/hotplug/Linux/init.d/xen-watchdog
index 8139ce543a0e69216c9542f538b3fc8db220f3c8..55dd0910937d2a9cb12039477635d6b482504084 100644 (file)
--- a/tools/hotplug/Linux/init.d/xen-watchdog
+++ b/tools/hotplug/Linux/init.d/xen-watchdog
@@ -10,7 +10,7 @@
 # Should-Start:      xend
 # Required-Stop:     $syslog $remote_fs
 # Should-Stop:       xend
-# Default-Start:     2 3 4 5
+# Default-Start:     2 3 5
 # Default-Stop:      0 1 6
 # Short-Description: Start/stop xen-watchdog
 # Description:       Run domain watchdog daemon.

diff --git a/tools/hotplug/Linux/init.d/xend b/tools/hotplug/Linux/init.d/xend
index 1a0cdf841bb149afd0835c0f7250f7c195a4a5eb..0fd7b1681f125819012cc339ab880b4a187260c0 100755 (executable)
--- a/tools/hotplug/Linux/init.d/xend
+++ b/tools/hotplug/Linux/init.d/xend
@@ -12,7 +12,7 @@
 # Should-Start:
 # Required-Stop:     $syslog $remote_fs xenstored xenconsoled 
 # Should-Stop:
-# Default-Start:     2 3 4 5
+# Default-Start:     2 3 5
 # Default-Stop:      0 1 6
 # Short-Description: Start/stop xend
 # Description:       Starts and stops the Xen control daemon.

diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains
index 0c4b2bfe8327c1d1689ac2175fbeaccdd1515541..c033581253288ce4535f7bc9bf71d0690ba47943 100644 (file)
--- a/tools/hotplug/Linux/init.d/xendomains
+++ b/tools/hotplug/Linux/init.d/xendomains
@@ -20,7 +20,7 @@
 # Should-Start:      xend
 # Required-Stop:     $syslog $remote_fs xenstored xenconsoled
 # Should-Stop:       xend
-# Default-Start:     2 3 4 5
+# Default-Start:     2 3 5
 # Default-Stop:      0 1 6
 # Short-Description: Start/stop secondary xen domains
 # Description:       Start / stop domains automatically when domain 0