From 571076b211bce69f5bfb1e7fa77edfb7527396cf Mon Sep 17 00:00:00 2001 From: Markus Hilger Date: Mon, 7 Sep 2026 03:45:36 +0200 Subject: [PATCH] Always netboot the SUSE 16 installer The attached-media branch could never be taken: the label pattern built from os-release is opensuse-leap-16.0 or sles-16.0, while the media is labelled Install-Leap-16.0-x86_64 and Install-SUSE-SLE-16-x86_64. Had it matched, it would have written an inst.repo to the dracut cmdline that agama does not read, and skipped inst.script entirely. --- .../dracut/hooks/pre-trigger/01-confluent.sh | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/confluent_osdeploy/suse16/initramfs/var/lib/dracut/hooks/pre-trigger/01-confluent.sh b/confluent_osdeploy/suse16/initramfs/var/lib/dracut/hooks/pre-trigger/01-confluent.sh index b6433769..7b6745fc 100644 --- a/confluent_osdeploy/suse16/initramfs/var/lib/dracut/hooks/pre-trigger/01-confluent.sh +++ b/confluent_osdeploy/suse16/initramfs/var/lib/dracut/hooks/pre-trigger/01-confluent.sh @@ -268,21 +268,10 @@ if [ "$textconsole" = "true" ] && ! grep console= /proc/cmdline > /dev/null; the fi fi -. /etc/os-release -if [ "$ID" = "dracut" ]; then - ID=$(echo $PRETTY_NAME|awk '{print $1}') - VERSION_ID=$(echo $VERSION|awk '{print $1}') -fi -ISOSRC=$(blkid -t TYPE=iso9660|grep -Ei ' LABEL="'$ID-$VERSION_ID|sed -e s/:.*//) -if [ -z "$ISOSRC" ]; then - echo root=live:$proto://$mgr/confluent-public/os/$profilename/distribution/1/LiveOS/squashfs.img >> /etc/cmdline.d/01-confluent.conf - echo -n " "inst.install_url=$proto://$mgr/confluent-public/os/$profilename/distribution/1/install >> /run/agama/cmdline.d/agama.conf - echo -n " "inst.script=$proto://$mgr/confluent-public/os/$profilename/autoinstall.sh" " >> /run/agama/cmdline.d/agama.conf - netroot=livenet:$proto://$mgr/confluent-public/os/$profilename/distribution/1/LiveOS/squashfs.img - -else - echo inst.repo=cdrom:$ISOSRC >> /etc/cmdline.d/01-confluent.conf -fi +echo root=live:$proto://$mgr/confluent-public/os/$profilename/distribution/1/LiveOS/squashfs.img >> /etc/cmdline.d/01-confluent.conf +echo -n " "inst.install_url=$proto://$mgr/confluent-public/os/$profilename/distribution/1/install >> /run/agama/cmdline.d/agama.conf +echo -n " "inst.script=$proto://$mgr/confluent-public/os/$profilename/autoinstall.sh" " >> /run/agama/cmdline.d/agama.conf +netroot=livenet:$proto://$mgr/confluent-public/os/$profilename/distribution/1/LiveOS/squashfs.img autoconfigmethod=$(grep ipv4_method /etc/confluent/confluent.deploycfg) autoconfigmethod=${autoconfigmethod#ipv4_method: } if [ "$autoconfigmethod" = "dhcp" ]; then