Browse code

Removed unwanted errors from ifup script

Change-Id: I3fb42af0a9dec8c53ec01574f90828c09c9ea42b
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1319
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

dthaluru authored on 2016/08/12 01:59:59
Showing 2 changed files
... ...
@@ -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:       8%{?dist}
4
+Release:       9%{?dist}
5 5
 License:       GPLv2
6 6
 URL:           http://photon.org
7 7
 Group:         System Environment/Base
... ...
@@ -35,8 +35,10 @@ ln -s sysctl.d/99-compat.conf %{buildroot}/%{_sysconfdir}/sysctl.conf
35 35
 %{_sysconfdir}/*
36 36
 /sbin/*
37 37
 %changelog
38
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.1-8
39
--	GA - Bump release of all rpms
38
+*    Thu Aug 11 2016 Onkar Deshpande <deshpandeo@vmware.com> 0.1-9
39
+-    Clean up
40
+*    Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.1-8
41
+-    GA - Bump release of all rpms
40 42
 *    Wed May 04 2016 Mahmoud Bassiouny <mbassiouny@vmware.com> 0.1-7
41 43
 *    ifup should fail if the assigned IP address exists in the network
42 44
 *    Tue Mar 29 2016 Vinay Kulkarni <kulkarniv@vmware.com> 0.1-6
... ...
@@ -34,25 +34,25 @@ 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. Bringnig $interface up..."
37
+print_message "$interface is DOWN or not assigned an IP. Bringing $interface up..."
38 38
 
39
-manualfilename=`ls ${SYSTEMD_NETWORK_CONF_DIR}/*$interface*.network.manual`
40
-if [[ -z  $manualfilename ]] ; then
41
-    print_message "Can not find the manual filename, let us search for the auto filename"
42
-    filename=`ls ${SYSTEMD_NETWORK_CONF_DIR}/*$interface*.network`
43
-    [[ -z  $filename ]] && fail "Can not find network interface file"
44
-else
39
+manualfilename=${SYSTEMD_NETWORK_CONF_DIR}/*$interface*.network.manual
40
+if [ -f  $manualfilename ] ; then
45 41
     filename=$manualfilename
42
+else
43
+    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"
46 46
 fi
47 47
 
48 48
 # Trying to parse the address from the file
49 49
 while read line
50
-do 
50
+do
51 51
     key=`echo $line | cut -d'=' -f1`
52 52
     if [ "$key" = "Address" ]
53
-    then 
53
+    then
54 54
         address=`echo $line | cut -d'=' -f2 | cut -d'/' -f1`
55
-    fi 
55
+    fi
56 56
 done < $filename
57 57
 
58 58
 [[ -z  $address ]] && print_message "Did not find address in the configuration file, may be it's dhcp, will not check for duplicates"