From: parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 18 Dec 2018 09:48:16 +0000 (+0100)
Subject: tentative hybrid code for 27 and 29
X-Git-Tag: bootcd-6.0-0~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5e88024bedef7d0f2b46affd502c181173d304ba;p=bootcd.git

tentative hybrid code for 27 and 29
---

diff --git a/initscripts/pl_netinit b/initscripts/pl_netinit
index 639a255..8422065 100755
--- a/initscripts/pl_netinit
+++ b/initscripts/pl_netinit
@@ -297,7 +297,8 @@ done
 
 # actually check to make sure ifconfig <device> succeeds
 
-/usr/libexec/nm-ifup $ETH_DEVICE >& /dev/null || {
+verbose-message Initializing $ETH_DEVICE
+/usr/libexec/nm-ifup $ETH_DEVICE || /sbin/ifconfig $ETH_DEVICE up || {
     verbose-message "pl_netinit: device $ETH_DEVICE does not exist, most likely"
     verbose-message "pl_netinit: this CD does not have hardware support for your"
     verbose-message "pl_netinit: network adapter. please send the following lines"
@@ -305,11 +306,11 @@ done
     net-init-failed
 }
 
-verbose-message "pl_netinit: attempting to start networking"
-/sbin/service network start
-
-# for backwards compatibility
-/sbin/ifconfig $ETH_DEVICE > $IFCONFIG_OUTPUT
+# my understanding is this is used to upload to MyPLC
+# details like mac addresses and the like
+# for backwards compatibility, in a best-effort manner,
+# we try and compensate for the disappearance of ifconfig
+( /sbin/ifconfig $ETH_DEVICE || ip address show $ETH_DEVICE ) > $IFCONFIG_OUTPUT
 
 verbose-message "pl_netinit: network online"