diff --git a/Makefile b/Makefile index a73f705..4da5c3a 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,6 @@ pck_catalogs := $(wildcard po/*.po) pck_plugins := $(wildcard postplug.d/*) pck_sysconfig := $(wildcard sysconfig/*) pck_defs := postplug/postplug-defs -pck_initscript = postplug/postplug-initscript pck_logrotate = postplug/postplug-logrotate pck_postplug = postplug/postplug pck_scripts := $(wildcard scripts/*) @@ -70,11 +69,9 @@ install-defs: $(pck_defs) $(INSTALL_DIR) $(DESTDIR)$(postplugdefsdir) $(INSTALL_DATA) $^ $(DESTDIR)$(postplugdefsdir)/$(PACKAGE).defs -install-initscript: $(pck_initscript) +install-initscript: @echo "installing initscript...";\ - $(INSTALL_DIR) $(DESTDIR)$(initrddir) $(INSTALL_DIR) $(DESTDIR)$(systemdunitdir) - $(INSTALL_SCRIPT) $^ $(DESTDIR)$(initrddir)/$(PACKAGE) $(INSTALL_DATA) postplug/postplug-service $(DESTDIR)$(systemdunitdir)/postplug.service install-logrotate: $(pck_logrotate) @@ -131,7 +128,6 @@ uninstall: done -rmdir $(DESTDIR)$(postplugdir) -rmdir $(DESTDIR)$(postplugrcdir) - rm -f $(DESTDIR)$(initrddir)/$(PACKAGE) rm -f $(DESTDIR)$(systemdunitdir)/postplug.service rm -f $(DESTDIR)$(localesdir)/*/LC_MESSAGES/$(PACKAGE).mo diff --git a/postplug/postplug-initscript b/postplug/postplug-initscript deleted file mode 100644 index 5d979b6..0000000 --- a/postplug/postplug-initscript +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# -# postplug This shell script enables the automatic startup of postplug -# Author: Silvan Calarco -# chkconfig: 345 70 01 -# description: Enable boot time execution of postplug - -PROGNAME=/sbin/postplug - -# source function library -. /etc/rc.d/init.d/functions -TEXTDOMAIN=postplug -TEXTDOMAINDIR=/usr/share/locale/ - -start() { - #echo -n "Starting $PROGNAME configuration tool: " - $PROGNAME - #echo -} - -stop() { - #echo -n "Stopping $PROGNAME configuration tool: " - # currently does nothing - #success - #(/bin/rm -f /var/lock/subsys/yum && success) || failure - #echo - : -} - -case "$1" in - start) - [ -e /bin/plymouth ] && plymouth message --text=$"Configuring system..." - start - [ -e /bin/plymouth ] && plymouth message --text=$"Configuring system...done" - ;; - stop) - stop - ;; - restart) - stop - start - ;; - *) - echo "*** Usage: $PROGNAME {start|stop|restart}" - exit 1 -esac - -exit 0