mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
Merge pull request #363 from YunoHost/enh-boot-prompt
[enh] Bootprompt is back
This commit is contained in:
commit
ebd5b33c31
4 changed files with 92 additions and 0 deletions
74
bin/yunoprompt
Executable file
74
bin/yunoprompt
Executable file
|
@ -0,0 +1,74 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Fetch ips
|
||||||
|
ip=$(hostname --all-ip-address)
|
||||||
|
|
||||||
|
# Fetch SSH fingerprints
|
||||||
|
i=0
|
||||||
|
for key in /etc/ssh/ssh_host_*_key.pub ; do
|
||||||
|
output=$(ssh-keygen -l -f $key)
|
||||||
|
fingerprint[$i]=" - $(echo $output | cut -d' ' -f2) $(echo $output| cut -d' ' -f4)"
|
||||||
|
i=$(($i + 1))
|
||||||
|
done
|
||||||
|
|
||||||
|
#
|
||||||
|
# Build the logo
|
||||||
|
#
|
||||||
|
|
||||||
|
LOGO=$(cat << 'EOF'
|
||||||
|
__ __ __ __ __ _ _______ __ __ _______ _______ _______
|
||||||
|
| | | || | | || | | || || | | || || || |
|
||||||
|
| |_| || | | || |_| || _ || |_| || _ || _____||_ _|
|
||||||
|
| || |_| || || | | || || | | || |_____ | |
|
||||||
|
|_ _|| || _ || |_| || _ || |_| ||_____ | | |
|
||||||
|
| | | || | | || || | | || | _____| | | |
|
||||||
|
|___| |_______||_| |__||_______||__| |__||_______||_______| |___|
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
# ' Put a quote in comment to make vim happy about syntax highlighting :s
|
||||||
|
|
||||||
|
#
|
||||||
|
# Build the actual message
|
||||||
|
#
|
||||||
|
|
||||||
|
LOGO_AND_FINGERPRINTS=$(cat << EOF
|
||||||
|
|
||||||
|
$LOGO
|
||||||
|
|
||||||
|
IP: ${ip}
|
||||||
|
SSH fingerprints:
|
||||||
|
${fingerprint[0]}
|
||||||
|
${fingerprint[1]}
|
||||||
|
${fingerprint[2]}
|
||||||
|
${fingerprint[3]}
|
||||||
|
${fingerprint[4]}
|
||||||
|
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
if [[ -f /etc/yunohost/installed ]]
|
||||||
|
then
|
||||||
|
echo "$LOGO_AND_FINGERPRINTS" > /etc/issue
|
||||||
|
else
|
||||||
|
sleep 5
|
||||||
|
chvt 2
|
||||||
|
echo "$LOGO_AND_FINGERPRINTS"
|
||||||
|
echo -e "\e[m Post-installation \e[0m"
|
||||||
|
echo "Congratulations! YunoHost has been successfully installed.\nTwo more steps are required to activate the services of your server."
|
||||||
|
read -p "Proceed to post-installation? (y/n) " -n 1
|
||||||
|
RESULT=1
|
||||||
|
while [ $RESULT -gt 0 ]; do
|
||||||
|
if [[ $REPLY =~ ^[Nn]$ ]]; then
|
||||||
|
chvt 1
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
echo -e "\n"
|
||||||
|
/usr/bin/yunohost tools postinstall
|
||||||
|
let RESULT=$?
|
||||||
|
if [ $RESULT -gt 0 ]; then
|
||||||
|
echo -e "\n"
|
||||||
|
read -p "Retry? (y/n) " -n 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
14
data/other/yunoprompt.service
Normal file
14
data/other/yunoprompt.service
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
[Unit]
|
||||||
|
Description=YunoHost boot prompt
|
||||||
|
After=getty@tty2.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
ExecStart=/usr/bin/yunoprompt
|
||||||
|
StandardInput=tty
|
||||||
|
TTYPath=/dev/tty2
|
||||||
|
TTYReset=yes
|
||||||
|
TTYVHangup=yes
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=default.target
|
1
debian/install
vendored
1
debian/install
vendored
|
@ -3,6 +3,7 @@ sbin/* /usr/sbin/
|
||||||
data/bash-completion.d/yunohost /etc/bash_completion.d/
|
data/bash-completion.d/yunohost /etc/bash_completion.d/
|
||||||
data/actionsmap/* /usr/share/moulinette/actionsmap/
|
data/actionsmap/* /usr/share/moulinette/actionsmap/
|
||||||
data/hooks/* /usr/share/yunohost/hooks/
|
data/hooks/* /usr/share/yunohost/hooks/
|
||||||
|
data/other/yunoprompt.service /etc/systemd/system/
|
||||||
data/other/* /usr/share/yunohost/yunohost-config/moulinette/
|
data/other/* /usr/share/yunohost/yunohost-config/moulinette/
|
||||||
data/templates/* /usr/share/yunohost/templates/
|
data/templates/* /usr/share/yunohost/templates/
|
||||||
data/helpers /usr/share/yunohost/
|
data/helpers /usr/share/yunohost/
|
||||||
|
|
3
debian/postinst
vendored
3
debian/postinst
vendored
|
@ -24,6 +24,9 @@ do_configure() {
|
||||||
"consider to start it by doing 'service yunohost-firewall start'."
|
"consider to start it by doing 'service yunohost-firewall start'."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Yunoprompt
|
||||||
|
systemctl enable yunoprompt.service
|
||||||
|
|
||||||
# remove old PAM config and update it
|
# remove old PAM config and update it
|
||||||
[[ ! -f /usr/share/pam-configs/my_mkhomedir ]] \
|
[[ ! -f /usr/share/pam-configs/my_mkhomedir ]] \
|
||||||
|| rm /usr/share/pam-configs/my_mkhomedir
|
|| rm /usr/share/pam-configs/my_mkhomedir
|
||||||
|
|
Loading…
Add table
Reference in a new issue