Skip to content
This repository has been archived by the owner on Jan 22, 2024. It is now read-only.

Commit

Permalink
ci: use networkd for iscsi test
Browse files Browse the repository at this point in the history
It seems that NM doesn't actually wait for the devices to come up
during boot, it just probes them. NM in dracut does a bit more magic,
like calling nm-initrd-generator among other things:
https://github.com/dracutdevs/dracut/blob/master/modules.d/35network-manager/nm-lib.sh.
  • Loading branch information
mrc0mmand authored and keszybz committed Dec 5, 2022
1 parent 68ca2e4 commit d9c3956
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-fedora.sh
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ for phase in "${PHASES[@]}"; do
INITRD="initrd_$KVER.cpio.zstd"
mkosi --cache "$MKOSI_CACHE" \
--default fedora.mkosi \
--package="NetworkManager,iscsi-initiator-utils" \
--package="iscsi-initiator-utils,systemd-networkd" \
--extra-tree=mkosi.extra-iscsi \
--image-version="$KVER" \
--environment=KERNEL_VERSION="$KVER" \
Expand Down Expand Up @@ -334,7 +334,7 @@ for phase in "${PHASES[@]}"; do
dnsmasq --interface=initrd0 --bind-interfaces --dhcp-range=10.10.10.10,10.10.10.100
grep -q initrd0 /etc/qemu/bridge.conf || echo "allow initrd0" >>/etc/qemu/bridge.conf

iscsi_cmdline="ip=dhcp netroot=iscsi:10.10.10.1::::$target_name"
iscsi_cmdline="ip=dhcp netroot=iscsi:10.10.10.1::::$target_name rd.systemd.wants=systemd-networkd.service rd.systemd.wants=systemd-networkd-wait-online.service"
timeout --foreground -k 10 5m \
qemu-kvm -m 1024 -smp "$(nproc)" -nographic -nic bridge,br=initrd0 \
-initrd "$INITRD" \
Expand Down

0 comments on commit d9c3956

Please sign in to comment.