Change-Id: I7fbb21ce83fd5d664662c23b2c8bfcb5dec0867d
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1359
Reviewed-by: suezzelur <anishs@vmware.com>
Tested-by: suezzelur <anishs@vmware.com>
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Set of scripts and tools to get compatbility with other distributions. |
| 2 | 2 |
Name: distrib-compat |
| 3 | 3 |
Version: 0.1 |
| 4 |
-Release: 9%{?dist}
|
|
| 4 |
+Release: 10%{?dist}
|
|
| 5 | 5 |
License: GPLv2 |
| 6 | 6 |
URL: http://photon.org |
| 7 | 7 |
Group: System Environment/Base |
| ... | ... |
@@ -35,6 +35,8 @@ ln -s sysctl.d/99-compat.conf %{buildroot}/%{_sysconfdir}/sysctl.conf
|
| 35 | 35 |
%{_sysconfdir}/*
|
| 36 | 36 |
/sbin/* |
| 37 | 37 |
%changelog |
| 38 |
+* Wed Sep 7 2016 Divya Thaluru <dthaluru@vmware.com> 0.1-10 |
|
| 39 |
+- Clean up |
|
| 38 | 40 |
* Thu Aug 11 2016 Onkar Deshpande <deshpandeo@vmware.com> 0.1-9 |
| 39 | 41 |
- Clean up |
| 40 | 42 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.1-8 |
| ... | ... |
@@ -34,15 +34,15 @@ hasip=$? |
| 34 | 34 |
|
| 35 | 35 |
[ $isupret -eq 0 -a $hasip -eq 0 ] && success "The interface is already up and assigned an IP" |
| 36 | 36 |
|
| 37 |
-print_message "$interface is DOWN or not assigned an IP. Bringing $interface up..." |
|
| 37 |
+print_message "$interface is DOWN or not assigned an IP. Bringnig $interface up..." |
|
| 38 | 38 |
|
| 39 |
-manualfilename=${SYSTEMD_NETWORK_CONF_DIR}/*$interface*.network.manual
|
|
| 40 |
-if [ -f $manualfilename ] ; then |
|
| 41 |
- filename=$manualfilename |
|
| 42 |
-else |
|
| 39 |
+manualfilename=`ls ${SYSTEMD_NETWORK_CONF_DIR}/*$interface*.network.manual 2>/dev/null`
|
|
| 40 |
+if [[ -z $manualfilename ]] ; then |
|
| 43 | 41 |
print_message "Can not find the manual filename, let us search for the auto filename" |
| 44 |
- filename=${SYSTEMD_NETWORK_CONF_DIR}/*$interface*.network
|
|
| 45 |
- [ -f $filename ] && fail "Can not find network interface file" |
|
| 42 |
+ filename=`ls ${SYSTEMD_NETWORK_CONF_DIR}/*$interface*.network 2>/dev/null`
|
|
| 43 |
+ [[ -z $filename ]] && fail "Can not find network interface file" |
|
| 44 |
+else |
|
| 45 |
+ filename=$manualfilename |
|
| 46 | 46 |
fi |
| 47 | 47 |
|
| 48 | 48 |
# Trying to parse the address from the file |