Skip lo device in alpine network config

Signed-off-by: Itxaka <itxaka@kairos.io>
This commit is contained in:
Itxaka 2024-10-03 15:57:57 +02:00
parent f921c38c44
commit 21a0071c90
2 changed files with 8 additions and 4 deletions

View File

@ -1,7 +1,7 @@
packages: packages:
- name: "alpine" - name: "alpine"
category: "initrd" category: "initrd"
version: "3.8.2-1" version: "3.8.2-2"
description: "Provides custom initrd scripts for alpine" description: "Provides custom initrd scripts for alpine"
# This syncs with the alpine version at https://gitlab.alpinelinux.org/alpine/mkinitfs/-/blob/master/initramfs-init.in?ref_type=heads # This syncs with the alpine version at https://gitlab.alpinelinux.org/alpine/mkinitfs/-/blob/master/initramfs-init.in?ref_type=heads
# any changes to the initramfs-init.in file should be looked at and backported if necessary # any changes to the initramfs-init.in file should be looked at and backported if necessary

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
VERSION=3.8.2-kairos3 VERSION=3.8.2-kairos4
INIT=/sbin/init INIT=/sbin/init
sysroot="$ROOT"/sysroot sysroot="$ROOT"/sysroot
# This is where we mount the livecd # This is where we mount the livecd
@ -212,6 +212,8 @@ retry() {
# uses the first network interface with state 'up'. # uses the first network interface with state 'up'.
ip_choose_if() { ip_choose_if() {
for x in "$ROOT"/sys/class/net/*; do for x in "$ROOT"/sys/class/net/*; do
# skip lo device
if [ "${x##*/}" == "lo" ];then continue; fi
if grep -iq up $x/operstate 2>/dev/null;then if grep -iq up $x/operstate 2>/dev/null;then
[ -e "$x" ] && echo ${x##*/} && return [ -e "$x" ] && echo ${x##*/} && return
fi fi
@ -220,7 +222,9 @@ ip_choose_if() {
} }
device_up() { device_up() {
for x in "$ROOT"/sys/class/net/eth*; do for x in "$ROOT"/sys/class/net/*; do
# skip lo device
if [ "${x##*/}" == "lo" ];then continue; fi
if grep -iq up $x/operstate 2>/dev/null;then if grep -iq up $x/operstate 2>/dev/null;then
[ -e "$x" ] && echo "Found up device: ${x##*/}" && return [ -e "$x" ] && echo "Found up device: ${x##*/}" && return
fi fi
@ -230,7 +234,7 @@ device_up() {
configure_ip() { configure_ip() {
# Sometimes it takes a bit for the device to come in UP state # Sometimes it takes a bit for the device to come in UP state
# so first check fi any eth devices are in UP state before getting the device # so first check for any eth devices are in UP state before getting the device
retry 5 device_up retry 5 device_up
device=$(ip_choose_if) device=$(ip_choose_if)