mirror of
				https://github.com/xcat2/confluent.git
				synced 2025-11-03 21:02:36 +00:00 
			
		
		
		
	Fix autoconsole output on diskless
This commit is contained in:
		@@ -8,7 +8,7 @@ get_remote_apikey() {
 | 
			
		||||
        confluent_apikey=$(cat /etc/confluent/confluent.apikey)
 | 
			
		||||
        if [ -z "$confluent_apikey" ]; then
 | 
			
		||||
            echo "Unable to acquire node api key, set deployment.apiarmed=once on node '$nodename', retrying..."
 | 
			
		||||
            if [ ! -z "$autocons" ]; then echo "Unable to acquire node api key, set deployment.apiarmed=once on node '$nodename', retrying..." > $autocons; fi
 | 
			
		||||
            if [ ! -z "$autoconsdev" ]; then echo "Unable to acquire node api key, set deployment.apiarmed=once on node '$nodename', retrying..." > $autoconsdev; fi
 | 
			
		||||
            sleep 10
 | 
			
		||||
        elif [ -c /dev/tpmrm0 ]; then
 | 
			
		||||
            tmpdir=$(mktemp -d)
 | 
			
		||||
@@ -39,6 +39,7 @@ echo sshd:x:30:30:SSH User:/var/empty/sshd:/sbin/nologin >> /etc/passwd
 | 
			
		||||
 | 
			
		||||
if ! grep console= /proc/cmdline >& /dev/null; then
 | 
			
		||||
    autocons=$(/opt/confluent/bin/autocons)
 | 
			
		||||
    autoconsdev=${autocons%,*}
 | 
			
		||||
    autocons=${autocons##*/}
 | 
			
		||||
    echo "Automatic console configured for $autocons"
 | 
			
		||||
fi
 | 
			
		||||
@@ -134,7 +135,7 @@ while [ $ready = "0" ]; do
 | 
			
		||||
        confluent_mgr=${confluent_mgr#[}
 | 
			
		||||
        confluent_mgr=${confluent_mgr%]}
 | 
			
		||||
    	echo 'Failure establishing TLS conneection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)'
 | 
			
		||||
	if [ ! -z "$autocons" ]; then echo 'Failure establishing TLS conneection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' > $autocons; fi
 | 
			
		||||
	if [ ! -z "$autoconsdev" ]; then echo 'Failure establishing TLS conneection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' > $autoconsdev; fi
 | 
			
		||||
    	sleep 1
 | 
			
		||||
    else
 | 
			
		||||
        ready=1
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user