summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorMartin Winter <mwinter@opensourcerouting.org>2017-04-14 10:28:13 +0200
committerMartin Winter <mwinter@opensourcerouting.org>2017-04-14 10:28:13 +0200
commit33fdbd5efb2ee997d1b4e10ef6da55536bcba7d5 (patch)
tree5f663458cc98bcb7ef547b2d6b3d8814dfd064d0 /redhat
parentredhat: Always disable PIMd on CentOS 6 and RedHat 6 systems as they are too ... (diff)
downloadfrr-33fdbd5efb2ee997d1b4e10ef6da55536bcba7d5.tar.xz
frr-33fdbd5efb2ee997d1b4e10ef6da55536bcba7d5.zip
redhat: Fix install (daemon selection) and make postun scripts compatible with fedora
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Diffstat (limited to 'redhat')
-rw-r--r--redhat/frr.spec.in70
1 files changed, 45 insertions, 25 deletions
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index 2cbc8f81c..13f6fca60 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -380,7 +380,9 @@ for daemon in %all_daemons ; do
done
%else
for daemon in %all_daemons ; do
- /sbin/chkconfig --add ${daemon}
+ if [ x"${daemon}" != x"" ] ; then
+ /sbin/chkconfig --add ${daemon}
+ fi
done
%endif
@@ -395,11 +397,13 @@ if [ ! -e %{_sysconfdir}/zebra.conf ]; then
chmod 640 %{_sysconfdir}/zebra.conf
fi
for daemon in %{all_daemons} ; do
- if [ ! -e %{_sysconfdir}/${daemon}.conf ]; then
- touch %{_sysconfdir}/${daemon}.conf
- %if 0%{?frr_user:1}
- chown %frr_user:%frr_user %{_sysconfdir}/${daemon}.conf*
- %endif
+ if [ x"${daemon}" != x"" ] ; then
+ if [ ! -e %{_sysconfdir}/${daemon}.conf ]; then
+ touch %{_sysconfdir}/${daemon}.conf
+ %if 0%{?frr_user:1}
+ chown %frr_user:%frr_user %{_sysconfdir}/${daemon}.conf*
+ %endif
+ fi
fi
done
%if %{with_watchfrr}
@@ -419,10 +423,12 @@ fi
if [ "$1" -ge 1 ]; then
# Find out which daemons need to be restarted.
for daemon in %all_daemons ; do
- if [ -f /var/lock/subsys/${daemon} ]; then
- eval restart_${daemon}=yes
- else
- eval restart_${daemon}=no
+ if [ x"${daemon}" != x"" ] ; then
+ if [ -f /var/lock/subsys/${daemon} ]; then
+ eval restart_${daemon}=yes
+ else
+ eval restart_${daemon}=no
+ fi
fi
done
# Rename restart flags for daemons handled specially.
@@ -441,18 +447,24 @@ if [ "$1" -ge 1 ]; then
#
# Stop all daemons other than zebra.
for daemon in %all_daemons ; do
- eval restart=\$restart_${daemon}
- [ "$restart" = yes ] && \
- %systemd_postun ${daemon}.service
+ if [ x"${daemon}" != x"" ] ; then
+ eval restart=\$restart_${daemon}
+ [ "$restart" = yes ] && \
+ %systemd_postun ${daemon}.service
+ :
+ fi
done
# Restart zebra.
[ "$running_zebra" = yes ] && \
%systemd_postun_with_restart $daemon.service
# Start all daemons other than zebra.
for daemon in %all_daemons ; do
- eval restart=\$restart_${daemon}
- [ "$restart" = yes ] && \
- %systemd_post ${daemon}.service
+ if [ x"${daemon}" != x"" ] ; then
+ eval restart=\$restart_${daemon}
+ [ "$restart" = yes ] && \
+ %systemd_post ${daemon}.service
+ :
+ fi
done
%else
##
@@ -465,18 +477,22 @@ if [ "$1" -ge 1 ]; then
%endif
# Stop all daemons other than zebra and watchfrr.
for daemon in %all_daemons ; do
- eval restart=\$restart_${daemon}
- [ "$restart" = yes ] && \
- /etc/rc.d/init.d/${daemon} stop >/dev/null 2>&1
+ if [ x"${daemon}" != x"" ] ; then
+ eval restart=\$restart_${daemon}
+ [ "$restart" = yes ] && \
+ /etc/rc.d/init.d/${daemon} stop >/dev/null 2>&1
+ fi
done
# Restart zebra.
[ "$running_zebra" = yes ] && \
/etc/rc.d/init.d/zebra restart >/dev/null 2>&1
# Start all daemons other than zebra and watchfrr.
for daemon in %all_daemons ; do
- eval restart=\$restart_${daemon}
- [ "$restart" = yes ] && \
- /etc/rc.d/init.d/${daemon} start >/dev/null 2>&1
+ if [ x"${daemon}" != x"" ] ; then
+ eval restart=\$restart_${daemon}
+ [ "$restart" = yes ] && \
+ /etc/rc.d/init.d/${daemon} start >/dev/null 2>&1
+ fi
done
%if %{with_watchfrr}
# Start watchfrr last.
@@ -494,7 +510,9 @@ fi
##
if [ "$1" = "0" ]; then
for daemon in %all_daemons ; do
- %systemd_preun ${daemon}.service
+ if [ x"${daemon}" != x"" ] ; then
+ %systemd_preun ${daemon}.service
+ fi
done
fi
%else
@@ -503,8 +521,10 @@ fi
##
if [ "$1" = "0" ]; then
for daemon in %all_daemons ; do
- /etc/rc.d/init.d/${daemon} stop >/dev/null 2>&1
- /sbin/chkconfig --del ${daemon}
+ if [ x"${daemon}" != x"" ] ; then
+ /etc/rc.d/init.d/${daemon} stop >/dev/null 2>&1
+ /sbin/chkconfig --del ${daemon}
+ fi
done
fi
%endif