starlingx/metal
Code Issues Proposed changes

debian: Remove sleep in network interface pre-up

Browse Source 
Remove the 20 second delay before bringing up the network
interface. This was done so that the network interface has
feature parity with Centos 7, but ifupdown detects nelink
differently compared to Centos 7. Removing the delay
results in a significant speed up.

In Debian, the network cable test is run by
/etc/network/if-up.d/00check-network-cable script.

Story: 2009221
Task: 45758

Test Plan

PASS Build platform-kickstarts package
PASS Build ISO
PASS Run bootstap/unlock
PASS Check /etc/network/interface.d/ifcfg-* if 'sleep 20'
     is still present.

Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: I0d7a6387cb42a0cb1af62fa49d6790b641c78b75
This commit is contained in:
Charles Short 2022-07-18 10:27:20 -04:00
parent f5605f0ce3
commit af907fd960
1 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
kickstart/files/kickstart.cfg
View File

@ -1812,25 +1812,6 @@ if [ ! -d "/etc/network/interfaces.d" ] ; then
mkdir -p -m 0775 /etc/network/interfaces.d mkdir -p -m 0775 /etc/network/interfaces.d
fi fi
# Build networking scripts, starting with the localhost interface
cat << EOF >> /etc/network/interfaces
# The loopback network interface
auto lo
iface lo inet loopback
EOF
if [ $mgmt_dev != "lo" ]; then
cat << EOF >> /etc/network/interfaces
# management network interface
allow-hotplug $mgmt_dev
auto $mgmt_dev
iface $mgmt_dev inet dhcp
EOF
fi
ilog "Setup network scripts" ilog "Setup network scripts"
if [ $mgmt_vlan -eq 0 ] ; then if [ $mgmt_vlan -eq 0 ] ; then
@ -1842,19 +1823,16 @@ if [ $mgmt_vlan -eq 0 ] ; then
# Build networking scripts # Build networking scripts
cat << EOF > /etc/network/interfaces.d/ifcfg-lo cat << EOF > /etc/network/interfaces.d/ifcfg-lo
auto lo auto lo
iface lo inet static iface lo inet loopback
address 127.0.0.1
netmask 255.0.0.0
post-up echo 0 > /proc/sys/net/ipv6/conf/lo/autoconf; echo 0 > /proc/sys/net/ipv6/conf/lo/accept_ra; echo 0 > /proc/sys/net/ipv6/conf/lo/accept_redirects
EOF EOF
if [ $mgmt_dev != "lo" ]; then
cat << EOF > /etc/network/interfaces.d/ifcfg-$mgmt_dev cat << EOF > /etc/network/interfaces.d/ifcfg-$mgmt_dev
auto $mgmt_dev auto $mgmt_dev
iface $mgmt_dev inet dhcp iface $mgmt_dev inet dhcp
pre-up sleep 20
post-up echo 0 > /proc/sys/net/ipv6/conf/lo/autoconf; echo 0 > /proc/sys/net/ipv6/conf/lo/accept_ra; echo 0 > /proc/sys/net/ipv6/conf/lo/accept_redirects post-up echo 0 > /proc/sys/net/ipv6/conf/lo/autoconf; echo 0 > /proc/sys/net/ipv6/conf/lo/accept_ra; echo 0 > /proc/sys/net/ipv6/conf/lo/accept_redirects
EOF EOF
fi
else else
@ -1889,7 +1867,6 @@ EOF
cat << EOF > /etc/network/interfaces.d/ifcfg-$mgmt_dev cat << EOF > /etc/network/interfaces.d/ifcfg-$mgmt_dev
auto $mgmt_dev auto $mgmt_dev
iface $mgmt_dev $mgmt_address_family manual iface $mgmt_dev $mgmt_address_family manual
pre-up sleep 20
post-up echo 0 > /proc/sys/net/ipv6/conf/lo/autoconf; echo 0 > /proc/sys/net/ipv6/conf/lo/accept_ra; echo 0 > /proc/sys/net/ipv6/conf/lo/accept_redirects post-up echo 0 > /proc/sys/net/ipv6/conf/lo/autoconf; echo 0 > /proc/sys/net/ipv6/conf/lo/accept_ra; echo 0 > /proc/sys/net/ipv6/conf/lo/accept_redirects
EOF EOF
@ -1897,7 +1874,6 @@ EOF
auto vlan$mgmt_vlan auto vlan$mgmt_vlan
iface vlan$mgmt_vlan $mgmt_address_family dhcp iface vlan$mgmt_vlan $mgmt_address_family dhcp
vlan-raw-device $mgmt_dev vlan-raw-device $mgmt_dev
pre-up sleep 20
post-up echo 0 > /proc/sys/net/ipv6/conf/lo/autoconf; echo 0 > /proc/sys/net/ipv6/conf/lo/accept_ra; echo 0 > /proc/sys/net/ipv6/conf/lo/accept_redirects post-up echo 0 > /proc/sys/net/ipv6/conf/lo/autoconf; echo 0 > /proc/sys/net/ipv6/conf/lo/accept_ra; echo 0 > /proc/sys/net/ipv6/conf/lo/accept_redirects
EOF EOF
fi fi