Migrate all calls to ourInit() to systemctl

perl -i -pe 's/ourInit (.+?) (.+)/systemctl $2 $1/' */debian/*(.)
untangle · Feb 28, 2018 · 6162f5b · 6162f5b
1 parent b48f232
commit 6162f5b
Show file tree

Hide file tree

Showing 51 changed files with 51 additions and 51 deletions.
diff --git a/untangle-apache2-config/debian/untangle-apache2-config.postinst b/untangle-apache2-config/debian/untangle-apache2-config.postinst
@@ -121,6 +121,6 @@ fi
 apply_oem="/usr/share/untangle/bin/apply-oem.sh"
 [ -f $apply_oem ] && $apply_oem
 
-ourInit apache2 restart
+systemctl restart apache2
 
 exit 0
diff --git a/untangle-firmware-common/debian/postinst b/untangle-firmware-common/debian/postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-firmware-common" ]; then
   update-rc.d untangle-firmware-common defaults >/dev/null # early on
-  ourInit untangle-firmware-common restart
+  systemctl restart untangle-firmware-common
 fi
 
 

diff --git a/untangle-hardware-amazon-ec2/debian/untangle-hardware-amazon-ec2.postinst b/untangle-hardware-amazon-ec2/debian/untangle-hardware-amazon-ec2.postinst
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -x "/etc/init.d/untangle-firmware-common" ]; then
-  ourInit untangle-firmware-common restart
+  systemctl restart untangle-firmware-common
 fi
 
 exit 0
diff --git a/untangle-hardware-asus-ac88u/debian/untangle-hardware-asus-ac88u.postinst b/untangle-hardware-asus-ac88u/debian/untangle-hardware-asus-ac88u.postinst
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -x "/etc/init.d/untangle-firmware-common" ]; then
-  ourInit untangle-firmware-common restart
+  systemctl restart untangle-firmware-common
 fi
 
 # disable rsyslog by default on linksys

diff --git a/untangle-hardware-config/debian/untangle-hardware-config.postinst b/untangle-hardware-config/debian/untangle-hardware-config.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-config" ]; then
   update-rc.d untangle-hardware-config defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-config restart
+  systemctl restart untangle-hardware-config
 fi
 
 # #12704: no forcing of FRAMEBUFFER in initramfs configuration; this

diff --git a/untangle-hardware-config/debian/untangle-hardware-config.prerm b/untangle-hardware-config/debian/untangle-hardware-config.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-config
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-jetway-u50w/debian/untangle-hardware-jetway-u50w.postinst b/untangle-hardware-jetway-u50w/debian/untangle-hardware-jetway-u50w.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-jetway-u50w" ]; then
   update-rc.d untangle-hardware-jetway-u50w defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-jetway-u50w restart
+  systemctl restart untangle-hardware-jetway-u50w
 fi
 
 exit 0
diff --git a/untangle-hardware-jetway-u50w/debian/untangle-hardware-jetway-u50w.prerm b/untangle-hardware-jetway-u50w/debian/untangle-hardware-jetway-u50w.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-jetway-u50w
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-lanner-m1500/debian/untangle-hardware-lanner-m1500.postinst b/untangle-hardware-lanner-m1500/debian/untangle-hardware-lanner-m1500.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-lanner-m1500" ]; then
   update-rc.d untangle-hardware-lanner-m1500 defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-lanner-m1500 restart
+  systemctl restart untangle-hardware-lanner-m1500
 fi
 
 exit 0
diff --git a/untangle-hardware-lanner-m1500/debian/untangle-hardware-lanner-m1500.prerm b/untangle-hardware-lanner-m1500/debian/untangle-hardware-lanner-m1500.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-lanner-m1500
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-lanner-m3000/debian/untangle-hardware-lanner-m3000.postinst b/untangle-hardware-lanner-m3000/debian/untangle-hardware-lanner-m3000.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-lanner-m3000" ]; then
   update-rc.d untangle-hardware-lanner-m3000 defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-lanner-m3000 restart
+  systemctl restart untangle-hardware-lanner-m3000
 fi
 
 exit 0
diff --git a/untangle-hardware-lanner-m3000/debian/untangle-hardware-lanner-m3000.prerm b/untangle-hardware-lanner-m3000/debian/untangle-hardware-lanner-m3000.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-lanner-m3000
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-lanner-u150/debian/untangle-hardware-lanner-u150.postinst b/untangle-hardware-lanner-u150/debian/untangle-hardware-lanner-u150.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-lanner-u150" ]; then
   update-rc.d untangle-hardware-lanner-u150 defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-lanner-u150 restart
+  systemctl restart untangle-hardware-lanner-u150
 fi
 
 exit 0
diff --git a/untangle-hardware-lanner-u150/debian/untangle-hardware-lanner-u150.prerm b/untangle-hardware-lanner-u150/debian/untangle-hardware-lanner-u150.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-lanner-u150
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-lanner-u25/debian/untangle-hardware-lanner-u25.postinst b/untangle-hardware-lanner-u25/debian/untangle-hardware-lanner-u25.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-lanner-u25" ]; then
   update-rc.d untangle-hardware-lanner-u25 defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-lanner-u25 restart
+  systemctl restart untangle-hardware-lanner-u25
 fi
 
 exit 0
diff --git a/untangle-hardware-lanner-u25/debian/untangle-hardware-lanner-u25.prerm b/untangle-hardware-lanner-u25/debian/untangle-hardware-lanner-u25.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-lanner-u25
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-lanner-u25w/debian/untangle-hardware-lanner-u25w.postinst b/untangle-hardware-lanner-u25w/debian/untangle-hardware-lanner-u25w.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-lanner-u25w" ]; then
   update-rc.d untangle-hardware-lanner-u25w defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-lanner-u25w restart
+  systemctl restart untangle-hardware-lanner-u25w
 fi
 
 exit 0
diff --git a/untangle-hardware-lanner-u25w/debian/untangle-hardware-lanner-u25w.prerm b/untangle-hardware-lanner-u25w/debian/untangle-hardware-lanner-u25w.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-lanner-u25w
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-lanner-u50/debian/untangle-hardware-lanner-u50.postinst b/untangle-hardware-lanner-u50/debian/untangle-hardware-lanner-u50.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-lanner-u50" ]; then
   update-rc.d untangle-hardware-lanner-u50 defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-lanner-u50 restart
+  systemctl restart untangle-hardware-lanner-u50
 fi
 
 exit 0
diff --git a/untangle-hardware-lanner-u50/debian/untangle-hardware-lanner-u50.prerm b/untangle-hardware-lanner-u50/debian/untangle-hardware-lanner-u50.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-lanner-u50
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-lanner-u500/debian/untangle-hardware-lanner-u500.postinst b/untangle-hardware-lanner-u500/debian/untangle-hardware-lanner-u500.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-lanner-u500" ]; then
   update-rc.d untangle-hardware-lanner-u500 defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-lanner-u500 restart
+  systemctl restart untangle-hardware-lanner-u500
 fi
 
 exit 0
diff --git a/untangle-hardware-lanner-u500/debian/untangle-hardware-lanner-u500.prerm b/untangle-hardware-lanner-u500/debian/untangle-hardware-lanner-u500.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-lanner-u500
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-linksys-wrt1900acs/debian/untangle-hardware-linksys-wrt1900acs.postinst b/untangle-hardware-linksys-wrt1900acs/debian/untangle-hardware-linksys-wrt1900acs.postinst
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -x "/etc/init.d/untangle-firmware-common" ]; then
-  ourInit untangle-firmware-common restart
+  systemctl restart untangle-firmware-common
 fi
 
 # 12.2.1 upgrade NGFW-10303

diff --git a/untangle-hardware-linksys-wrt3200acm/debian/untangle-hardware-linksys-wrt3200acm.postinst b/untangle-hardware-linksys-wrt3200acm/debian/untangle-hardware-linksys-wrt3200acm.postinst
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -x "/etc/init.d/untangle-firmware-common" ]; then
-  ourInit untangle-firmware-common restart
+  systemctl restart untangle-firmware-common
 fi
 
 # 12.2.1 upgrade NGFW-10303

diff --git a/untangle-hardware-portwell-m1500/debian/untangle-hardware-portwell-m1500.postinst b/untangle-hardware-portwell-m1500/debian/untangle-hardware-portwell-m1500.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-portwell-m1500" ]; then
   update-rc.d untangle-hardware-portwell-m1500 defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-portwell-m1500 restart
+  systemctl restart untangle-hardware-portwell-m1500
 fi
 
 exit 0
diff --git a/untangle-hardware-portwell-m1500/debian/untangle-hardware-portwell-m1500.prerm b/untangle-hardware-portwell-m1500/debian/untangle-hardware-portwell-m1500.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-portwell-m1500
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-portwell-m3000/debian/untangle-hardware-portwell-m3000.postinst b/untangle-hardware-portwell-m3000/debian/untangle-hardware-portwell-m3000.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-portwell-m3000" ]; then
   update-rc.d untangle-hardware-portwell-m3000 defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-portwell-m3000 restart
+  systemctl restart untangle-hardware-portwell-m3000
 fi
 
 exit 0
diff --git a/untangle-hardware-portwell-m3000/debian/untangle-hardware-portwell-m3000.prerm b/untangle-hardware-portwell-m3000/debian/untangle-hardware-portwell-m3000.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-portwell-m3000
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-portwell-u10/debian/untangle-hardware-portwell-u10.postinst b/untangle-hardware-portwell-u10/debian/untangle-hardware-portwell-u10.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-portwell-u10" ]; then
   update-rc.d untangle-hardware-portwell-u10 defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-portwell-u10 restart
+  systemctl restart untangle-hardware-portwell-u10
 fi
 
 exit 0
diff --git a/untangle-hardware-portwell-u10/debian/untangle-hardware-portwell-u10.prerm b/untangle-hardware-portwell-u10/debian/untangle-hardware-portwell-u10.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-portwell-u10
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-portwell-u150/debian/untangle-hardware-portwell-u150.postinst b/untangle-hardware-portwell-u150/debian/untangle-hardware-portwell-u150.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-portwell-u150" ]; then
   update-rc.d untangle-hardware-portwell-u150 defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-portwell-u150 restart
+  systemctl restart untangle-hardware-portwell-u150
 fi
 
 exit 0
diff --git a/untangle-hardware-portwell-u150/debian/untangle-hardware-portwell-u150.prerm b/untangle-hardware-portwell-u150/debian/untangle-hardware-portwell-u150.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-portwell-u150
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-portwell-u50/debian/untangle-hardware-portwell-u50.postinst b/untangle-hardware-portwell-u50/debian/untangle-hardware-portwell-u50.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-portwell-u50" ]; then
   update-rc.d untangle-hardware-portwell-u50 defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-portwell-u50 restart
+  systemctl restart untangle-hardware-portwell-u50
 fi
 
 exit 0
diff --git a/untangle-hardware-portwell-u50/debian/untangle-hardware-portwell-u50.prerm b/untangle-hardware-portwell-u50/debian/untangle-hardware-portwell-u50.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-portwell-u50
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-portwell-u500/debian/untangle-hardware-portwell-u500.postinst b/untangle-hardware-portwell-u500/debian/untangle-hardware-portwell-u500.postinst
@@ -2,7 +2,7 @@
 
 if [ -x "/etc/init.d/untangle-hardware-portwell-u500" ]; then
   update-rc.d untangle-hardware-portwell-u500 defaults 10 >/dev/null # early on
-  ourInit untangle-hardware-portwell-u500 restart
+  systemctl restart untangle-hardware-portwell-u500
 fi
 
 exit 0
diff --git a/untangle-hardware-portwell-u500/debian/untangle-hardware-portwell-u500.prerm b/untangle-hardware-portwell-u500/debian/untangle-hardware-portwell-u500.prerm
@@ -4,7 +4,7 @@ SERVICE=untangle-hardware-portwell-u500
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-qotom-u25x/debian/postinst b/untangle-hardware-qotom-u25x/debian/postinst
@@ -4,7 +4,7 @@ SERVICE=${DPKG_MAINTSCRIPT_PACKAGE}
 
 if [ -x "/etc/init.d/${SERVICE}" ]; then
   update-rc.d ${SERVICE} defaults 10 >/dev/null # early on
-  ourInit ${SERVICE} restart
+  systemctl restart ${SERVICE}
 fi
 
 exit 0
diff --git a/untangle-hardware-qotom-u25x/debian/prerm b/untangle-hardware-qotom-u25x/debian/prerm
@@ -4,7 +4,7 @@ SERVICE=${DPKG_MAINTSCRIPT_PACKAGE}
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-qotom-u25xw/debian/postinst b/untangle-hardware-qotom-u25xw/debian/postinst
@@ -4,7 +4,7 @@ SERVICE=${DPKG_MAINTSCRIPT_PACKAGE}
 
 if [ -x "/etc/init.d/${SERVICE}" ]; then
   update-rc.d ${SERVICE} defaults 10 >/dev/null # early on
-  ourInit ${SERVICE} restart
+  systemctl restart ${SERVICE}
 fi
 
 exit 0
diff --git a/untangle-hardware-qotom-u25xw/debian/prerm b/untangle-hardware-qotom-u25xw/debian/prerm
@@ -4,7 +4,7 @@ SERVICE=${DPKG_MAINTSCRIPT_PACKAGE}
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-qotom-u50x/debian/postinst b/untangle-hardware-qotom-u50x/debian/postinst
@@ -4,7 +4,7 @@ SERVICE=${DPKG_MAINTSCRIPT_PACKAGE}
 
 if [ -x "/etc/init.d/${SERVICE}" ]; then
   update-rc.d ${SERVICE} defaults 10 >/dev/null # early on
-  ourInit ${SERVICE} restart
+  systemctl restart ${SERVICE}
 fi
 
 swapNic() {

diff --git a/untangle-hardware-qotom-u50x/debian/prerm b/untangle-hardware-qotom-u50x/debian/prerm
@@ -4,7 +4,7 @@ SERVICE=${DPKG_MAINTSCRIPT_PACKAGE}
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;

diff --git a/untangle-hardware-qotom-u50xw/debian/postinst b/untangle-hardware-qotom-u50xw/debian/postinst
@@ -4,7 +4,7 @@ SERVICE=${DPKG_MAINTSCRIPT_PACKAGE}
 
 if [ -x "/etc/init.d/${SERVICE}" ]; then
   update-rc.d ${SERVICE} defaults 10 >/dev/null # early on
-  ourInit ${SERVICE} restart
+  systemctl restart ${SERVICE}
 fi
 
 swapNic() {

diff --git a/untangle-hardware-qotom-u50xw/debian/prerm b/untangle-hardware-qotom-u50xw/debian/prerm
@@ -4,7 +4,7 @@ SERVICE=${DPKG_MAINTSCRIPT_PACKAGE}
 
 case "$1" in
     remove|deconfigure)
-      ourInit $SERVICE stop
+      systemctl stop $SERVICE
       ;;
     upgrade|failed-upgrade)
         ;;