diff --git a/distro-files/etc/profile b/distro-files/etc/profile index 0cfd0af8..561df4c7 100644 --- a/distro-files/etc/profile +++ b/distro-files/etc/profile @@ -11,4 +11,5 @@ alias grep="grep --color=auto" if [ $(tty) == "/dev/console" ] then alias startwm="exec /usr/libexec/astral/startwm" + alias startnscde="exec /usr/libexec/astral/startnscde" fi diff --git a/distro-files/usr/libexec/astral/startnscde b/distro-files/usr/libexec/astral/startnscde new file mode 100644 index 00000000..449d4d98 --- /dev/null +++ b/distro-files/usr/libexec/astral/startnscde @@ -0,0 +1,22 @@ +#!/usr/bin/bash +export DISPLAY=":0" +X & +while [ 1 ] +do + if [ -S /tmp/.X11-unix/X0 ] + then + break + fi + + if [ $SECONDS -gt 15 ] + then + echo timeout + exit 1 + fi + + sleep 0.5 +done +stty -echo -echoctl -isig -icanon min 0 time 0 +nscde &> /tmp/.nscdestderr > /tmp/.nscdestdout +stty -echo -echoctl -isig -icanon min 0 time 0 +cat - diff --git a/recipes/distro-files b/recipes/distro-files index 162a4269..910299d3 100644 --- a/recipes/distro-files +++ b/recipes/distro-files @@ -1,5 +1,5 @@ name=distro-files -revision=2 +revision=3 from_source=distro-files package() { @@ -27,5 +27,7 @@ package() { chmod +x ${dest_dir}/etc/local.d/firstboot.start chmod +x ${dest_dir}/usr/bin/astral-bootstrap chmod +x ${dest_dir}/usr/bin/astral-chroot + chmod +x ${dest_dir}/usr/libexec/astral/startwm + chmod +x ${dest_dir}/usr/libexec/astral/startnscde chmod +x ${dest_dir}/root/hello.sh ${dest_dir}/home/astral/hello.sh ${dest_dir}/etc/skel/hello.sh }