Fix package builds after removal of icinga2-{en,dis}able-feature scripts

refs #7250

diff --git a/debian/icinga2-common.install b/debian/icinga2-common.install
index 9380cb74eaa1f3e678106cb0ce5f227f6b4f601d..53913a018b2f39c38f5992453e57d0b4b036562c 100644 (file)
--- a/debian/icinga2-common.install
+++ b/debian/icinga2-common.install
@@ -5,7 +5,6 @@ debian/tmp/etc/bash_completion.d
 tools/syntax/*                       usr/share/icinga2-common/syntax
 usr/bin/icinga2-build*
 usr/bin/icinga2-sign-key
-usr/sbin/icinga2-*-feature
 usr/sbin/icinga2-list-objects
 usr/sbin/icinga2-*-agent
 usr/sbin/icinga2-list-agents

diff --git a/icinga2.spec b/icinga2.spec
index c10c0803e785d410c7aa0dd07bd6ae03e6a0fb85..f1d5a00330a86aa581a3a15bb5764283bb6ca1e7 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -391,7 +391,7 @@ exit 0
 %postun ido-mysql
 if [ "$1" = "0" ]; then
        # deinstallation of the package - remove feature
-       test -x %{_sbindir}/icinga2 feature disable && %{_sbindir}/icinga2 feature disable ido-mysql
+       test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable ido-mysql
 fi
 
 exit 0
@@ -408,7 +408,7 @@ exit 0
 %postun ido-pgsql
 if [ "$1" = "0" ]; then
        # deinstallation of the package - remove feature
-       test -x %{_sbindir}/icinga2 feature disable && %{_sbindir}/icinga2 feature disable ido-pgsql
+       test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable ido-pgsql
 fi
 
 exit 0
@@ -425,9 +425,9 @@ exit 0
 %postun classicui-config
 if [ "$1" = "0" ]; then
         # deinstallation of the package - remove feature
-        test -x %{_sbindir}/icinga2 feature disable && %{_sbindir}/icinga2 feature disable statusdata
-        test -x %{_sbindir}/icinga2 feature disable && %{_sbindir}/icinga2 feature disable compatlog
-        test -x %{_sbindir}/icinga2 feature disable && %{_sbindir}/icinga2 feature disable command
+        test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable statusdata
+        test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable compatlog
+        test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable command
 fi
 
 exit 0
@@ -483,7 +483,6 @@ exit 0
 %{_datadir}/%{name}
 %exclude %{_datadir}/%{name}/include
 %{_mandir}/man8/%{name}.8.gz
-%{_mandir}/man8/%{name}-feature enable.8.gz
 %{_mandir}/man8/%{name}-build-ca.8.gz
 %{_mandir}/man8/%{name}-build-key.8.gz
 %{_mandir}/man8/%{name}-sign-key.8.gz

diff --git a/test/jenkins/livestatus_socket.test b/test/jenkins/livestatus_socket.test
index aef58f24a982af4a5310df3f838b325a03ad2787..1e71cc9e72205291cc69c95cb1acc9cf0ebb553a 100755 (executable)
--- a/test/jenkins/livestatus_socket.test
+++ b/test/jenkins/livestatus_socket.test
@@ -4,7 +4,7 @@ livestatus_path="/var/run/icinga2/cmd/livestatus"
 
 if [ ! -e $livestatus_path ];
 then
-    sudo icinga2-feature enable livestatus 1> /dev/null
+    sudo icinga2 feature enable livestatus 1> /dev/null
     sudo service icinga2 restart 1> /dev/null
     sleep 1
 

diff --git a/test/jenkins/statusdata.test b/test/jenkins/statusdata.test
index b0d3f93bd333c1d9b993f4501709a759d126f534..932cd333bf7f09148f8ba1c0912a090133e411fc 100755 (executable)
--- a/test/jenkins/statusdata.test
+++ b/test/jenkins/statusdata.test
@@ -5,7 +5,7 @@ objectscache_path="/var/cache/icinga2/objects.cache"
 
 if [ ! -f $statusdata_path ];
 then
-    sudo icinga2-feature enable statusdata 1> /dev/null
+    sudo icinga2 feature enable statusdata 1> /dev/null
     sudo service icinga2 restart 1> /dev/null
 
     n=0