Remove obsolete Red Hat Upstart and SuSE SysV init scripts (#1162)

Netatalk · Jul 1, 2024 · 3f393db · 3f393db
1 parent e2c9e1a
commit 3f393db
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 512 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -247,7 +247,8 @@ jobs:
             ninja-build \
             openldap-devel \
             openssl-devel \
-            quota-devel
+            quota-devel \
+            systemd
       - name: Autotools - Bootstrap
         run: ./bootstrap
       - name: Autotools - Configure
@@ -256,7 +257,7 @@ jobs:
             --enable-krbV-uam \
             --enable-pgp-uam \
             --enable-quota \
-            --enable-redhat \
+            --enable-systemd \
             --with-libtirpc \
             --with-cracklib=/usr/share/cracklib
       - name: Autotools - Build
@@ -270,9 +271,10 @@ jobs:
       - name: Meson - Configure
         run: |
           meson setup build \
-            -Dwith-tests=true \
+            -Dwith-init-hooks=false \
+            -Dwith-init-style=redhat-systemd \
             -Dwith-quota=true \
-            -Dwith-init-style=redhat-sysv
+            -Dwith-tests=true
       - name: Meson - Build
         run: meson compile -C build
       - name: Meson - Tests

diff --git a/configure.ac b/configure.ac
@@ -318,45 +318,13 @@ AC_ARG_ENABLE(locking,
 
 )
 
-AC_ARG_ENABLE(redhat,
-	[  --enable-redhat         use redhat-style sysv (upstart) configuration ],[
-	if test "$enableval" = "yes"; then
-		sysv_style=redhat
-	fi
-	AC_MSG_RESULT([enabling redhat-style sysv support])
-	]
-)
-
-AC_ARG_ENABLE(redhat-sysv,
-	[  --enable-redhat-sysv    obsoleted ],[
-	echo "ERROR: --enable-redhat-sysv is obsoleted. Use --enable-redhat."
-	exit 1
-	]
-)
-
 AC_ARG_ENABLE(redhat-systemd,
 	[  --enable-redhat-systemd obsoleted ],[
 	echo "ERROR: --enable-redhat-systemd is obsoleted. Use --enable-systemd."
 	exit 1
 	]
 )
 
-AC_ARG_ENABLE(suse,
-	[  --enable-suse           use suse-style sysv configuration ],[
-	if test "$enableval" = "yes"; then
-		sysv_style=suse
-	fi
-	AC_MSG_RESULT([enabling suse-style sysv support])
-	]
-)
-
-AC_ARG_ENABLE(suse-sysv,
-	[  --enable-suse-sysv      obsoleted ],[
-	echo "ERROR: --enable-suse-sysv is obsoleted. Use --enable-suse."
-	exit 1
-	]
-)
-
 AC_ARG_ENABLE(suse-systemd,
 	[  --enable-suse-systemd   obsoleted ],[
 	echo "ERROR: --enable-suse-systemd is obsoleted. Use --enable-systemd."

diff --git a/distrib/initscripts/Makefile.am b/distrib/initscripts/Makefile.am
@@ -32,9 +32,7 @@ GENERATED_FILES = \
 	rc.debian		\
 	rc.openrc		\
 	rc.papd.netbsd		\
-	rc.redhat		\
 	rc.solaris		\
-	rc.suse			\
 	rc.timelord.netbsd	\
 	timelord.service
 
@@ -53,9 +51,7 @@ TEMPLATES = \
 	rc.debian.tmpl			\
 	rc.openrc.tmpl			\
 	rc.papd.netbsd.tmpl		\
-	rc.redhat.tmpl			\
 	rc.solaris.tmpl			\
-	rc.suse.tmpl			\
 	rc.timelord.netbsd.tmpl		\
 	timelord.service.tmpl
 
@@ -68,32 +64,6 @@ EXTRA_DIST = $(TEMPLATES)
 
 uninstall: uninstall-startup
 
-#
-# checking for Red Hat style sysv scripts:
-#
-
-if USE_REDHAT
-
-sysvdir	= /etc/rc.d/init.d
-sysv_SCRIPTS = netatalk
-
-$(sysv_SCRIPTS): rc.redhat
-	cp -f rc.redhat $(sysv_SCRIPTS)
-	chmod a+x $(sysv_SCRIPTS)
-
-install-data-hook:
-if USE_INSTALL_PRIVILEGED
-	-chkconfig --add $(sysv_SCRIPTS)
-endif
-
-uninstall-startup:
-if USE_INSTALL_PRIVILEGED
-	-chkconfig --del $(sysv_SCRIPTS)
-	rm -f $(DESTDIR)$(sysvdir)/$(sysv_SCRIPTS)
-endif
-
-endif
-
 #
 # checking for general systemd scripts:
 #
@@ -117,32 +87,6 @@ endif
 
 endif
 
-#
-# checking for SUSE style sysv scripts:
-#
-
-if USE_SUSE
-
-sysvdir	= /etc/init.d
-sysv_SCRIPTS = netatalk
-
-$(sysv_SCRIPTS): rc.suse
-	cp -f rc.suse $(sysv_SCRIPTS)
-	chmod a+x $(sysv_SCRIPTS)
-
-install-data-hook:
-if USE_INSTALL_PRIVILEGED
-	-insserv $(sysv_SCRIPTS)
-endif
-
-uninstall-startup:
-if USE_INSTALL_PRIVILEGED
-	-insserv -d $(sysv_SCRIPTS)
-	rm -f $(DESTDIR)$(sysvdir)/$(sysv_SCRIPTS)
-endif
-
-endif
-
 #
 # checking for NetBSD init scripts
 #

diff --git a/distrib/initscripts/meson.build b/distrib/initscripts/meson.build
@@ -54,42 +54,6 @@ elif get_option('with-init-style') == 'debian-sysv'
             '10',
         )
     endif
-elif get_option('with-init-style') == 'redhat-sysv'
-    init_dir += '/etc/rc.d/init.d'
-    custom_target(
-        'redhat',
-        input: 'rc.redhat.tmpl',
-        output: 'netatalk',
-        command: sed_command,
-        capture: true,
-        install: true,
-        install_dir: init_dir,
-        install_mode: 'rwxr-xr-x',
-    )
-    if get_option('with-init-hooks')
-        meson.add_install_script(
-            find_program('chkconfig'),
-            '--add', '/etc/rc.d/init.d/netatalk',
-        )
-    endif
-elif get_option('with-init-style') == 'suse-sysv'
-    init_dir += '/etc/init.d'
-    custom_target(
-        'suse_sysv',
-        input: 'rc.suse.tmpl',
-        output: 'netatalk',
-        command: sed_command,
-        capture: true,
-        install: true,
-        install_dir: init_dir,
-        install_mode: 'rwxr-xr-x',
-    )
-    if get_option('with-init-hooks')
-        meson.add_install_script(
-            find_program('insserv'),
-            '/etc/init.d/netatalk',
-        )
-    endif
 elif get_option('with-init-style') == 'netbsd'
     init_dir += '/etc/rc.d'
     rc_scripts = [