- systemd is passe
authorMarcin Krol <hawk@tld-linux.org>
Mon, 27 Apr 2015 10:37:54 +0000 (10:37 +0000)
committerMarcin Krol <hawk@tld-linux.org>
Mon, 27 Apr 2015 10:37:54 +0000 (10:37 +0000)
klogd.service [deleted file]
sysklogd.spec
syslog.service [deleted file]

diff --git a/klogd.service b/klogd.service
deleted file mode 100644 (file)
index 3fdcb6c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]                                                                                                                                                                           
-Description=System Kernel Logging Service
-After=syslog.service
-
-[Service]
-EnvironmentFile=/etc/sysconfig/klogd
-ExecStart=/sbin/service klogd start
-ExecStop=/sbin/service klogd stop
-Type=forking
-
-[Install]
-WantedBy=multi-user.target
index 1a03b18fd3d6178ac8cdbe9acdf28af9e4d213dd..c77c5aff63c70abfa283c1910e89b61d4357e5e0 100644 (file)
@@ -22,8 +22,6 @@ Source5:      klogd.init
 Source6:       klogd.sysconfig
 Source7:       syslogd-listfiles.sh
 Source8:       syslogd-listfiles.8
-Source9:       syslog.service
-Source10:      klogd.service
 Patch0:                %{name}-bind.patch
 Patch1:                %{name}-alpha.patch
 Patch2:                %{name}-alphafoo.patch
@@ -102,14 +100,12 @@ Requires(pre):    /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(pre): /usr/sbin/usermod
-Requires(post,preun,postun):   systemd-units >= 38
 Requires(triggerpostun):       sed >= 4.0
 # for vservers we don't need klogd and syslog works without klogd
 # (just it doesn't log kernel buffer into syslog)
 # Requires:    klogd
 Requires:      logrotate >= 3.2-3
 Requires:      psmisc >= 20.1
-Requires:       systemd-units >= 38
 Suggests:      klogd
 Provides:      group(syslog)
 Provides:       service(syslog)
@@ -149,8 +145,6 @@ Requires(pre):      /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(pre): /usr/sbin/usermod
-Requires(post,preun,postun):   systemd-units >= 38
-Requires:       systemd-units >= 38
 Suggests:      syslog
 Provides:      group(syslog)
 Provides:      user(syslog)
@@ -188,7 +182,7 @@ do logowania komunikatów jądra Linuksa.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d,logrotate.d} \
        $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8},%{_bindir}} \
-       $RPM_BUILD_ROOT{/dev,/var/log/news,%{systemdunitdir}}
+       $RPM_BUILD_ROOT{/dev,/var/log/news}
 
 %{__make} install \
        BINDIR=$RPM_BUILD_ROOT%{_sbindir} \
@@ -204,8 +198,6 @@ install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/klogd
 
 install %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/syslogd-listfiles
 install %{SOURCE8} $RPM_BUILD_ROOT%{_mandir}/man8
-install %{SOURCE9} $RPM_BUILD_ROOT%{systemdunitdir}
-install %{SOURCE10} $RPM_BUILD_ROOT%{systemdunitdir}
 
 for n in debug kernel maillog messages secure syslog user spooler lpr daemon
 do
@@ -233,21 +225,17 @@ done
 %service syslog restart "syslog daemon"
 %service -q klogd restart
 
-%systemd_post syslog.service
-
 %preun -n syslog
 if [ "$1" = "0" ]; then
        %service syslog stop
        /sbin/chkconfig --del syslog
 fi
-%systemd_preun syslog.service
 
 %postun -n syslog
 if [ "$1" = "0" ]; then
        %userremove syslog
        %groupremove syslog
 fi
-%systemd_reload
 
 %pre -n klogd
 %groupadd -P klogd -g 18 syslog
@@ -257,21 +245,18 @@ fi
 %post -n klogd
 /sbin/chkconfig --add klogd
 %service klogd restart "kernel logger daemon"
-%systemd_post klogd.service
 
 %preun -n klogd
 if [ "$1" = "0" ]; then
        %service klogd stop
        /sbin/chkconfig --del klogd
 fi
-%systemd_preun klogd.service
 
 %postun -n klogd
 if [ "$1" = "0" ]; then
        %userremove syslog
        %groupremove syslog
 fi
-%systemd_reload
 
 %triggerpostun -- inetutils-syslogd
 /sbin/chkconfig --del syslog
@@ -292,10 +277,7 @@ sed -i -e '/^ADDITIONAL_SOCK=/s/-a //g' /etc/sysconfig/syslog
 # survive syslog reload
 chgrp syslog /etc/syslog.conf
 
-%systemd_trigger syslog.service
-
 %triggerpostun -n klogd -- klogd < 1.5-4
-%systemd_trigger klogd.service
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -313,7 +295,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/syslogd-listfiles
 %{_mandir}/man5/*
 %{_mandir}/man8/sys*
-%{systemdunitdir}/syslog.service
 
 %files -n klogd
 %defattr(644,root,root,755)
@@ -321,4 +302,3 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/klogd
 %attr(755,root,root) %{_sbindir}/klogd
 %{_mandir}/man8/klog*
-%{systemdunitdir}/klogd.service
diff --git a/syslog.service b/syslog.service
deleted file mode 100644 (file)
index 7f9f9cd..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]                                                                                                                                                                           
-Description=System Logging Service
-
-[Service]
-EnvironmentFile=/etc/sysconfig/syslog
-ExecStart=/sbin/service syslog start
-ExecStop=/sbin/service syslog stop
-Type=forking
-
-[Install]
-WantedBy=multi-user.target