rancher/packages
1
0
Fork 0
mirror of https://github.com/kairos-io/packages.git synced 2025-07-08 20:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert fix for alpine network (#1093)

Browse Source
This commit is contained in:
Itxaka 2024-10-03 21:58:20 +02:00 committed by GitHub
parent 487ca43c87
commit 8facccf729
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/alpine/collection.yaml
View File

@ -1,7 +1,7 @@
packages: packages:
- name: "alpine" - name: "alpine"
category: "initrd" category: "initrd"
version: "3.8.2-2" version: "3.8.2-3"
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

8
packages/alpine/files/initramfs-init
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
VERSION=3.8.2-kairos4 VERSION=3.8.2-kairos5
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
@ -211,9 +211,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/eth*; do
# skip lo device # 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
@ -222,9 +221,8 @@ ip_choose_if() {
} }
device_up() { device_up() {
for x in "$ROOT"/sys/class/net/*; do for x in "$ROOT"/sys/class/net/eth*; do
# skip lo device # 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