Neither /sbin/ip nor /sbin/ifconfig might be installed

We still might to have lo network if initrd took take care, like it does on our current distros
openSUSE · Mar 23, 2022 · c6ac358 · c6ac358
1 parent 067ee3f
commit c6ac358
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/build-vm b/build-vm
@@ -1198,13 +1198,13 @@ vm_wrapup_build() {
 }
 
 vm_setup_network() {
-    if test -x /sbin/ip ; then 
+    if test -x /sbin/ip ; then
 	ip addr add 127.0.0.1/8 dev lo
 	ip addr add ::1/128 dev lo
 	ip link set lo up
-    else
-	ifconfig lo 127.0.0.1 up
-	ifconfig lo add ::1/128
+    elif test -x /sbin/ifconfig ; then
+        ifconfig lo 127.0.0.1 up
+        ifconfig lo add ::1/128
     fi
     . /.build/build.data
     if test -n "$VM_NETWORK"; then

diff --git a/call-podman b/call-podman
@@ -45,13 +45,13 @@ if test -n "$IS_UNSHARED" ; then
     mount --make-rprivate /
 
     # create loopback interface
-    if test -x /sbin/ip ; then 
+    if test -x /sbin/ip ; then
 	ip addr add 127.0.0.1/8 dev lo
 	ip addr add ::1/128 dev lo
 	ip link set lo up
-    else 
-	ifconfig lo 127.0.0.1 up
-	ifconfig lo add ::1/128
+    elif test -x /sbin/ifconfig ; then
+        ifconfig lo 127.0.0.1 up
+        ifconfig lo add ::1/128
     fi   
 fi
 

diff --git a/startdockerd b/startdockerd
@@ -118,11 +118,11 @@ if test -n "$IS_UNSHARED" ; then
     mount --make-rprivate /
 
     # create loopback interface
-    if test -x /sbin/ip ; then 
+    if test -x /sbin/ip ; then
 	ip addr add 127.0.0.1/8 dev lo
 	ip addr add ::1/128 dev lo
 	ip link set lo up
-    else 
+    elif test -x /sbin/ifconfig ; then
 	ifconfig lo 127.0.0.1 up
 	ifconfig lo add ::1/128
     fi