nchevsky/systemrescue-zfs
1
0
Fork 0
mirror of https://github.com/nchevsky/systemrescue-zfs.git synced 2026-03-28 05:55:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make dovnc imply dostartx

Browse source 
Also do not append more than once to /root/.bash_profile in case both dovnc and dostartx are set.

Fixes systemrescue/systemrescue-sources#234
This commit is contained in:
Marcos Mello 2021-11-10 21:13:13 -03:00
parent 8bf8c4a7ac
commit 7744f40caa
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
airootfs/etc/systemd/scripts/sysrescue-initialize
View file

@ -52,11 +52,14 @@ do
;;
# Auto-start the graphical environment (tty1 only)
dostartx)
# dovnc implies dostartx
dostartx|dovnc)
echo "Found option '${curopt}' on the boot command line"
echo '[[ ! $DISPLAY ]] && [[ ! $SSH_TTY ]] && [[ $XDG_VTNR == 1 ]] && startx' | \
tee -a /root/.bash_profile > /root/.zlogin
;;
str='[[ ! $DISPLAY ]] && [[ ! $SSH_TTY ]] && [[ $XDG_VTNR == 1 ]] && startx'
grep -qF "$str" /root/.bash_profile || echo "$str" >> /root/.bash_profile
echo "$str" > /root/.zlogin
# Must not break the case block because there is another dovnc pattern to match below
;;&
# Require authenticated console access
noautologin)
@ -79,7 +82,7 @@ do
# Auto-start x11vnc with the graphical environment
dovnc)
echo "Found option '${curopt}' on the boot command line"
# The "Found option..." message was already shown above in the dostartx pattern
{
echo '[ -f ~/.vnc/passwd ] && pwopt="-usepw" || pwopt="-nopw"'
echo 'x11vnc $pwopt -nevershared -forever -logfile /var/log/x11vnc.log &'