diff --git a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh index f441504e..bc327610 100644 --- a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh +++ b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh @@ -7,8 +7,8 @@ if ! grep console= /proc/cmdline >& /dev/null; then if [ -n "$autocons" ]; then echo console=$autocons |sed -e 's!/dev/!!' >> /tmp/01-autocons.conf autocons=${autocons%,*} - echo $autocons > /tmp/01-autocons.devnode - echo "Detected firmware specified console at $(cat /tmp/01-autocons.conf)" > $autocons + echo $autocons > /tmp/01-autocons.devnode + echo "Detected firmware specified console at $(cat /tmp/01-autocons.conf)" > $autocons echo "Initializing auto detected console when installer starts" > $autocons fi fi @@ -16,4 +16,5 @@ if grep console=ttyS /proc/cmdline >& /dev/null; then echo "Serial console has been requested in the kernel arguments, the local video may not show progress" > /dev/tty1 fi . /lib/anaconda-lib.sh +echo rd.fcoe=0 > /etc/cmdline.d/nofcoe.conf wait_for_kickstart diff --git a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh index caa60997..8701cc7e 100644 --- a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh +++ b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh @@ -99,6 +99,10 @@ if [ -e /dev/disk/by-label/CNFLNT_IDNT ]; then fi fi done + for NICGUESS in $(ip link|grep LOWER_UP|grep -v LOOPBACK| awk '{print $2}' | sed -e 's/:$//'); do + ip addr flush dev $NICGUESS + ip link set $NICGUESS down + done NetworkManager --configure-and-quit=initrd --no-daemon hmackeyfile=/tmp/cnflnthmackeytmp echo -n $(grep ^apitoken: cnflnt.yml|awk '{print $2}') > $hmackeyfile @@ -175,7 +179,7 @@ if [ ! -z "$autocons" ]; then errout="-e $autocons" fi while ! confluentpython /opt/confluent/bin/apiclient $errout /confluent-api/self/deploycfg2 > /etc/confluent/confluent.deploycfg; do - sleep 10 + sleep 10 done ifidx=$(cat /tmp/confluent.ifidx 2> /dev/null) if [ -z "$ifname" ]; then @@ -216,15 +220,15 @@ proto=${proto#protocol: } textconsole=$(grep ^textconsole: /etc/confluent/confluent.deploycfg) textconsole=${textconsole#textconsole: } if [ "$textconsole" = "true" ] && ! grep console= /proc/cmdline > /dev/null; then - autocons=$(cat /tmp/01-autocons.devnode) - if [ ! -z "$autocons" ]; then - echo Auto-configuring installed system to use text console - echo Auto-configuring installed system to use text console > $autocons + autocons=$(cat /tmp/01-autocons.devnode) + if [ ! -z "$autocons" ]; then + echo Auto-configuring installed system to use text console + echo Auto-configuring installed system to use text console > $autocons /opt/confluent/bin/autocons -c > /dev/null - cp /tmp/01-autocons.conf /etc/cmdline.d/ - else - echo "Unable to automatically detect requested text console" - fi + cp /tmp/01-autocons.conf /etc/cmdline.d/ + else + echo "Unable to automatically detect requested text console" + fi fi . /etc/os-release @@ -327,4 +331,8 @@ if [ -e /lib/nm-lib.sh ]; then fi fi fi +for NICGUESS in $(ip link|grep LOWER_UP|grep -v LOOPBACK| awk '{print $2}' | sed -e 's/:$//'); do + ip addr flush dev $NICGUESS + ip link set $NICGUESS down +done