xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-12 18:59:06 +00:00
Code Issues Projects Releases Wiki Activity

Try to adjust suse autoconsole behavior

Browse Source
This commit is contained in:
Jarrod Johnson 2020-05-18 16:07:38 -04:00
parent 14ba48da1f
commit d12ac8a1ba
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent
View File

@ -12,7 +12,7 @@ autocons=""
if ! grep console /proc/cmdline > /dev/null; then
autocons=$(/opt/confluent/bin/autocons)
if [ ! -z "$autocons" ]; then
echo "ConsoleDevice: ${autocons%,*}" >> /etc/linuxrc.d/01-confluent
echo "Serial console detected from firmmware: $autocons" > ${autocons%,*}
fi
fi
cd /sys/class/net
@ -40,6 +40,13 @@ echo "NetDevice: $bootif" >> /etc/linuxrc.d/01-confluent
/opt/confluent/bin/clortho $nodename $mgr > /tmp/confluent.apikey
mgr="[$mgr]"
curl -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /tmp/confluent.apikey)" https://$mgr/confluent-api/self/deploycfg > /tmp/confluent.deploycfg
textconsole=$(grep ^textconsole: /tmp/confluent.deploycfg)
textconsole=${textconsole#textconsole: }
if [ "$textconsole" = "true" ] && ! grep console= /proc/cmdline > /dev/null && [ ! -z "$autocons" ]; then
cat /proc/cmdline |sed -e s'/$/ 'console=${autocons#*/dev/}/ /> /etc/fakecmdline
mount -o bind /etc/fakecmdline /proc/cmdline
echo "ConsoleDevice: ${autocons%,*}" >> /etc/linuxrc.d/01-confluent
fi
tz=$(grep timezone: /tmp/confluent.deploycfg | awk '{print $2}')
echo "<timezone>${tz}</timezone>" > /tmp/timezone

2
confluent_osdeploy/ubuntu20.04/initramfs/conf/conf.d/confluent
View File

@ -2,7 +2,7 @@ if ! grep console= /proc/cmdline > /dev/null; then
/opt/confluent/bin/autocons > /custom-installation/autocons.info
cons=$(cat /custom-installation/autocons.info)
if [ ! -z "$cons" ]; then
echo "Auto-detected serial console on $cons, please wait" > ${cons%,*}
echo "Auto-detected serial console: $cons" > ${cons%,*}
fi
fi
echo /scripts/init-premount/confluent >> /scripts/init-premount/ORDER

2
confluent_osdeploy/ubuntu20.04/initramfs/custom-installation/hooks/casper-bottom.sh
View File

@ -43,7 +43,7 @@ if [ -f /custom-installation/autocons.info ]; then
cons=$(cat /custom-installation/autocons.info)
fi
if [ ! -z "$cons" ]; then
echo "Installation will proceed on graphics console, autoconsole cannot work during install for Ubuntu" > ${cons%,*}
echo "Installation will proceed on graphics console, autoconsole not supported for Ubuntu" > ${cons%,*}
#fcmdline="$fcmdline console=${cons#/dev/}"
fi
echo $fcmdline > /custom-installation/confluent/fakecmdline