Browse code
Replace killall by pkill in ifcfg (bug 1677326)
Change-Id: I336f2f456da89764d36331595cebcd6e7b91109c
Reviewed-on: http://photon-jenkins.eng.vmware.com/1086
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: suezzelur <anishs@vmware.com>
nickshize authored on 2016/06/16 16:50:51Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Basic and advanced IPV4-based networking |
| 2 | 2 |
Name: iproute2 |
| 3 | 3 |
Version: 4.2.0 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: GPLv2+ |
| 6 | 6 |
URL: http://www.kernel.org/pub/linux/utils/net/iproute2 |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -9,6 +9,8 @@ Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
Source0: http://www.kernel.org/pub/linux/utils/net/iproute2/%{name}-%{version}.tar.xz
|
| 11 | 11 |
%define sha1 iproute2=2585177e94fddb59418db149692d0726cde30774 |
| 12 |
+Patch0: replace_killall_by_pkill.patch |
|
| 13 |
+ |
|
| 12 | 14 |
%description |
| 13 | 15 |
The IPRoute2 package contains programs for basic and advanced |
| 14 | 16 |
IPV4-based networking. |
| ... | ... |
@@ -17,6 +19,8 @@ IPV4-based networking. |
| 17 | 17 |
sed -i '/^TARGETS/s@arpd@@g' misc/Makefile |
| 18 | 18 |
sed -i /ARPD/d Makefile |
| 19 | 19 |
sed -i 's/arpd.8//' man/man8/Makefile |
| 20 |
+%patch0 -p1 |
|
| 21 |
+ |
|
| 20 | 22 |
%build |
| 21 | 23 |
make VERBOSE=1 %{?_smp_mflags} DESTDIR= LIBDIR=%{_libdir}
|
| 22 | 24 |
%install |
| ... | ... |
@@ -34,6 +38,8 @@ make DESTDIR=%{buildroot} \
|
| 34 | 34 |
%{_defaultdocdir}/%{name}-%{version}/*
|
| 35 | 35 |
%{_mandir}/*/*
|
| 36 | 36 |
%changelog |
| 37 |
+* Thu Jun 16 2016 Nick Shi <nshi@vmware.com> 4.2.0-3 |
|
| 38 |
+- Replace killall by pkill in ifcfg |
|
| 37 | 39 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.2.0-2 |
| 38 | 40 |
- GA - Bump release of all rpms |
| 39 | 41 |
* Tue Jan 12 2016 Xiaolin Li <xiaolinl@vmware.com> 4.2.0-1 |
| 40 | 42 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,14 @@ |
| 0 |
+--- a/ip/ifcfg 2015-08-31 16:31:15.000000000 -0700 |
|
| 1 |
+@@ -15,7 +15,10 @@ |
|
| 2 |
+ } |
|
| 3 |
+ |
|
| 4 |
+ RestartRDISC () {
|
|
| 5 |
+- killall -HUP rdisc || rdisc -fs |
|
| 6 |
++ #killall is shipped with psmisc package which is not installed by default |
|
| 7 |
++ # on minimal photon installation, use pkill command instead. |
|
| 8 |
++ #killall -HUP rdisc || rdisc -fs |
|
| 9 |
++ pkill -HUP '^rdisc*' || rdisc -fs |
|
| 10 |
+ } |
|
| 11 |
+ |
|
| 12 |
+ ABCMaskLen () {
|