diff --git a/flux/src/xconf.sh b/flux/src/xconf.sh index 6a65bfc5..9460ba76 100644 --- a/flux/src/xconf.sh +++ b/flux/src/xconf.sh @@ -3,12 +3,12 @@ rm -f /xconf.sh ########################################## # xrdp-link -$RUN export xrdp=/usr/local/xrdp; -if [ -s "$xrdp/sbin/xrdp" ]; then - ln -s $xrdp/sbin/xrdp /usr/sbin/; ln -s $xrdp/sbin/xrdp-sesman /usr/sbin/;\ - ln -s $xrdp/sbin/xrdp-chansrv /usr/sbin/; ln -s $xrdp/bin/xrdp-keygen /usr/bin/; +# $RUN export xrdp=/usr/local/xrdp; +# if [ -s "$xrdp/sbin/xrdp" ]; then +# ln -s $xrdp/sbin/xrdp /usr/sbin/; ln -s $xrdp/sbin/xrdp-sesman /usr/sbin/;\ +# ln -s $xrdp/sbin/xrdp-chansrv /usr/sbin/; ln -s $xrdp/bin/xrdp-keygen /usr/bin/; +# fi mkdir -p /etc/xrdp && xrdp-keygen xrdp auto #/etc/xrdp/rsakeys.ini -fi ########################################## # && ln -s /usr/bin/supervisorctl /usr/bin/sv \ @@ -114,8 +114,8 @@ $RUN \ sed -i "s^OSH_THEME=\"font\"^OSH_THEME=\"axin\"^g" /home/headless/.bashrc; # link: Xvnc, vncpasswd -$RUN rm -f /usr/bin/Xvnc; ln -s /usr/local/static/bin/Xvnc /usr/bin/Xvnc; \ - rm -f /usr/bin/vncpasswd; ln -s /usr/local/static/bin/vncpasswd /usr/bin/vncpasswd; +# $RUN rm -f /usr/bin/Xvnc; ln -s /usr/local/static/bin/Xvnc /usr/bin/Xvnc; \ +# rm -f /usr/bin/vncpasswd; ln -s /usr/local/static/bin/vncpasswd /usr/bin/vncpasswd; # for core: avoid multi> 'dbus-daemon --syslog --fork --print-pid 4 --print-address 6 --session'; #(headless x2, root x1) kill -9 `ps -ef |grep dbus |grep -v grep |awk '{print $2}'` \ No newline at end of file