systemd units added

diff --git a/bird-ipv4.service b/bird-ipv4.service
new file mode 100644 (file)
index 0000000..20f8904
--- /dev/null
+++ b/bird-ipv4.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=BIRD Internet Routing Daemon for IPv4
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/bird -u bird -g bird
+ExecReload=/usr/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+Alias=bird.service

diff --git a/bird-ipv6.service b/bird-ipv6.service
new file mode 100644 (file)
index 0000000..e08eea3
--- /dev/null
+++ b/bird-ipv6.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=BIRD Internet Routing Daemon for IPv6
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/bird-6 -u bird -g bird
+ExecReload=/usr/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+Alias=bird-6.service

diff --git a/bird.spec b/bird.spec
index beb53beaefb1a440f908125a18961d8272a428c7..0c09ed49d4a028d25723a5a99e9e8189302e7ca2 100644 (file)
--- a/bird.spec
+++ b/bird.spec
@@ -10,7 +10,7 @@ Summary:      The BIRD Internet Routing Daemon
 Summary(pl.UTF-8):     Demon BIRD Internetowego Routingu Dynamicznego
 Name:          bird
 Version:       1.4.5
 Summary(pl.UTF-8):     Demon BIRD Internetowego Routingu Dynamicznego
 Name:          bird
 Version:       1.4.5

-Release:       1
+Release:       2

 License:       GPL v2+
 Group:         Networking/Daemons
 Source0:       ftp://bird.network.cz/pub/bird/%{name}-%{version}.tar.gz
 License:       GPL v2+
 Group:         Networking/Daemons
 Source0:       ftp://bird.network.cz/pub/bird/%{name}-%{version}.tar.gz


@@ -21,6 +21,8 @@ Source3:      %{name}-ipv6.init
 Source4:       %{name}-ipv6.sysconfig
 Source5:       ftp://bird.network.cz/pub/bird/%{name}-doc-%{version}.tar.gz
 # Source5-md5: cdb4b36f35fed407ddb6f2c8e93ddd91
 Source4:       %{name}-ipv6.sysconfig
 Source5:       ftp://bird.network.cz/pub/bird/%{name}-doc-%{version}.tar.gz
 # Source5-md5: cdb4b36f35fed407ddb6f2c8e93ddd91

+Source6:       %{name}-ipv4.service
+Source7:       %{name}-ipv6.service

 Patch0:                %{name}-allowalien.patch
 URL:           http://bird.network.cz/
 BuildRequires: autoconf
 Patch0:                %{name}-allowalien.patch
 URL:           http://bird.network.cz/
 BuildRequires: autoconf


@@ -136,7 +138,8 @@ mv bird bird-6
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/sysconfig,%{_sbindir}}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/sysconfig,%{_sbindir}} \
+       $RPM_BUILD_ROOT%{systemdunitdir}

 
 install birdc $RPM_BUILD_ROOT%{_sbindir}
 
 
 install birdc $RPM_BUILD_ROOT%{_sbindir}
 


@@ -145,6 +148,7 @@ install bird $RPM_BUILD_ROOT%{_sbindir}
 install doc/bird.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-ipv4
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-ipv4
 install doc/bird.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-ipv4
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-ipv4

+install %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-ipv4.service

 %endif
 
 %if %{with ipv6}
 %endif
 
 %if %{with ipv6}


@@ -156,6 +160,7 @@ EOF
 :> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}6.conf
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-ipv6
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-ipv6
 :> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}6.conf
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-ipv6
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-ipv6

+install %{SOURCE7} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-ipv6.service

 %endif
 
 %clean
 %endif
 
 %clean


@@ -174,27 +179,43 @@ fi
 %post ipv4
 /sbin/chkconfig --add %{name}-ipv4
 %service %{name}-ipv4 restart "routing daemon"
 %post ipv4
 /sbin/chkconfig --add %{name}-ipv4
 %service %{name}-ipv4 restart "routing daemon"

+%systemd_post %{name}-ipv4.service

 
 %preun ipv4
 if [ "$1" = "0" ]; then
        %service %{name}-ipv4 stop
        /sbin/chkconfig --del %{name}-ipv4
 fi
 
 %preun ipv4
 if [ "$1" = "0" ]; then
        %service %{name}-ipv4 stop
        /sbin/chkconfig --del %{name}-ipv4
 fi

+%systemd_preun %{name}-ipv4.service
+
+%postun ipv4
+%systemd_reload

 
 %post ipv6
 /sbin/chkconfig --add %{name}-ipv6
 %service %{name}-ipv6 restart "routing daemon"
 
 %post ipv6
 /sbin/chkconfig --add %{name}-ipv6
 %service %{name}-ipv6 restart "routing daemon"

+%systemd_post %{name}-ipv6.service

 
 %preun ipv6
 if [ "$1" = "0" ]; then
        %service %{name}-ipv6 stop
        /sbin/chkconfig --del %{name}-ipv6
 fi
 
 %preun ipv6
 if [ "$1" = "0" ]; then
        %service %{name}-ipv6 stop
        /sbin/chkconfig --del %{name}-ipv6
 fi

+%systemd_preun %{name}-ipv6.service
+
+%postun ipv6
+%systemd_reload

 
 %triggerpostun ipv4 -- %{name}-ipv4 < 1.3.4-3
 chmod 0640 /etc/bird.conf
 chgrp bird /etc/bird.conf
 
 
 %triggerpostun ipv4 -- %{name}-ipv4 < 1.3.4-3
 chmod 0640 /etc/bird.conf
 chgrp bird /etc/bird.conf
 

+%triggerpostun -- %{name}-ipv4 < 1.4.5-2
+%systemd_trigger %{name}-ipv4.service
+
+%triggerpostun -- %{name}-ipv6 < 1.4.5-2
+%systemd_trigger %{name}-ipv6.service
+

 %files
 %defattr(644,root,root,755)
 %doc doc/*.html doc/reply_codes %{name}-doc-%{version}/doc/*.ps ChangeLog NEWS README TODO
 %files
 %defattr(644,root,root,755)
 %doc doc/*.html doc/reply_codes %{name}-doc-%{version}/doc/*.ps ChangeLog NEWS README TODO


@@ -207,6 +228,7 @@ chgrp bird /etc/bird.conf
 %attr(754,root,root) /etc/rc.d/init.d/bird-ipv4
 %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bird-ipv4
 %attr(640,root,bird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bird.conf
 %attr(754,root,root) /etc/rc.d/init.d/bird-ipv4
 %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bird-ipv4
 %attr(640,root,bird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bird.conf

+%{systemdunitdir}/%{name}-ipv4.service

 %endif
 
 %if %{with ipv6}
 %endif
 
 %if %{with ipv6}


@@ -217,4 +239,5 @@ chgrp bird /etc/bird.conf
 %attr(754,root,root) /etc/rc.d/init.d/bird-ipv6
 %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bird-ipv6
 %attr(640,root,bird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bird6.conf
 %attr(754,root,root) /etc/rc.d/init.d/bird-ipv6
 %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bird-ipv6
 %attr(640,root,bird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bird6.conf

+%{systemdunitdir}/%{name}-ipv6.service

 %endif
 %endif