Update xlaunch to match NixOS update

svn path=/nixpkgs/trunk/; revision=18655
This commit is contained in:
Michael Raskin 2009-11-26 20:17:20 +00:00
parent 95970eb095
commit fe10a3aed5

View File

@ -45,7 +45,7 @@ EOF
else
RESET_OPTION=\"-noreset\"
fi;
XCMD=\"\$(egrep \"^env\" /etc/event.d/xserver | sed -e \"s/env/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\"
XCMD=\"\$(egrep \"^env\" /etc/init/xserver.conf | sed -e \"s/env/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\"
echo \"\$XCMD\"
echo \"\$XCMD\" | bash &
while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done