Attachment 581126 Details for Bug 817442 – [4/9] Fix build and uninstall-trigger for '--without ipv6' option

[patch] [4/9] Fix build and uninstall-trigger for '--without ipv6' option

Fix-without-ipv6-option.patch (text/plain), 1.60 KB, created by David Ward on 2012-04-30 03:24:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Ward

Created: 2012-04-30 03:24:29 UTC

Size: 1.60 KB

patch

obsolete

>From 23b6577f530f6dea35a0f7e98d1f9d651dc1e5cb Mon Sep 17 00:00:00 2001
>From: David Ward <david.ward@ll.mit.edu>
>Date: Sat, 21 Apr 2012 21:15:47 -0400
>Subject: [PATCH 4/9] Fix build and uninstall-trigger for '--without ipv6'
> option
>
>---
> quagga.spec |   10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/quagga.spec b/quagga.spec
>index 4775f40..effdef1 100644
>--- a/quagga.spec
>+++ b/quagga.spec
>@@ -137,6 +137,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
> %configure \
> %if %with_ipv6
> 	--enable-ipv6=yes \
>+%else
>+	--enable-ipv6=no \
> %endif
> %if %with_snmp
> 	--enable-snmp=yes \
>@@ -313,6 +315,12 @@ fi
> 	/sbin/chkconfig --del bgpd >/dev/null 2>&1 || :
> 	/sbin/chkconfig --del ospfd >/dev/null 2>&1 || :
> 	/sbin/chkconfig --del watchquagga >/dev/null 2>&1 || :
>+%if !%with_ipv6
>+	/sbin/service ospf6d stop >/dev/null 2>&1 || :
>+	/sbin/service ripngd stop >/dev/null 2>&1 || :
>+%endif
>+	/sbin/chkconfig --del ospf6d >/dev/null 2>&1 || :
>+	/sbin/chkconfig --del ripngd >/dev/null 2>&1 || :
> 	/bin/systemctl try-restart zebra.service >/dev/null 2>&1 || :
> 	/bin/systemctl try-restart isisd.service >/dev/null 2>&1 || :
> 	/bin/systemctl try-restart ripd.service >/dev/null 2>&1 || :
>@@ -320,8 +328,6 @@ fi
> 	/bin/systemctl try-restart ospfd.service >/dev/null 2>&1 || :
> 	/bin/systemctl try-restart watchquagga.service >/dev/null 2>&1 || :
> %if %with_ipv6
>-	/sbin/chkconfig --del ospf6d >/dev/null 2>&1 || :
>-	/sbin/chkconfig --del ripngd >/dev/null 2>&1 || :
> 	/bin/systemctl try-restart ospf6d.service >/dev/null 2>&1 || :
> 	/bin/systemctl try-restart ripngd.service >/dev/null 2>&1 || :
> %endif
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 817442: 581123 | 581124 | 581125 | 581126 | 581127 | 581128 | 581129 | 581130 | 581131