Misc issues with yunoprompt

This commit is contained in:
Alexandre Aubin 2021-01-25 03:57:51 +01:00
parent 62e84d8b4b
commit 5ab5c83d54
2 changed files with 8 additions and 8 deletions

View file

@ -6,7 +6,7 @@ x509_fingerprint=$(openssl x509 -in /etc/yunohost/certs/yunohost.org/crt.pem -n
# Fetch SSH fingerprints # Fetch SSH fingerprints
i=0 i=0
for key in $(ls /etc/ssh/ssh_host_{ed25519,rsa,ecdsa}_key.pub 2> /dev/null) ; do for key in $(ls /etc/ssh/ssh_host_{ed25519,rsa,ecdsa}_key.pub 2> /dev/null) ; do
output=$(ssh-keygen -l -f $key) output=$(ssh-keygen -l -f $key)
fingerprint[$i]=" - $(echo $output | cut -d' ' -f2) $(echo $output| cut -d' ' -f4)" fingerprint[$i]=" - $(echo $output | cut -d' ' -f2) $(echo $output| cut -d' ' -f4)"
i=$(($i + 1)) i=$(($i + 1))
@ -43,22 +43,21 @@ LOGO_AND_FINGERPRINTS=$(cat << EOF
$LOGO $LOGO
IP: ${local_ip} Local IP: ${local_ip:-(no ip detected?)}
X509 fingerprint: ${x509_fingerprint} Local SSL CA X509 fingerprint:
${x509_fingerprint}
SSH fingerprints: SSH fingerprints:
${fingerprint[0]} ${fingerprint[0]}
${fingerprint[1]} ${fingerprint[1]}
${fingerprint[2]} ${fingerprint[2]}
${fingerprint[3]}
${fingerprint[4]}
EOF EOF
) )
if [[ -f /etc/yunohost/installed ]] echo "$LOGO_AND_FINGERPRINTS" > /etc/issue
if [[ ! -f /etc/yunohost/installed ]]
then then
echo "$LOGO_AND_FINGERPRINTS" > /etc/issue
else
chvt 2 chvt 2
# Formatting # Formatting

View file

@ -1,6 +1,7 @@
[Unit] [Unit]
Description=YunoHost boot prompt Description=YunoHost boot prompt
After=getty@tty2.service After=getty@tty2.service
After=network.target
[Service] [Service]
Type=simple Type=simple