summaryrefslogtreecommitdiffstats
path: root/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay
diff options
context:
space:
mode:
authorCecil Hugh Watson <knoppmyth@gmail.com>2008-12-02 09:01:33 (GMT)
committerCecil Hugh Watson <knoppmyth@gmail.com>2008-12-02 09:01:33 (GMT)
commit56b0ac3ddfdc91139fcbe0e11dc946978ae04a42 (patch)
tree6239df4065119b5b7de9c489e16f80022ca900e2 /build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay
parent597d7a7a5383da4ba6ec9866e0b70962b68b2417 (diff)
parent699d87c76662d820f97a6c4b0ab151fac849770b (diff)
downloadlinhes_dev-56b0ac3ddfdc91139fcbe0e11dc946978ae04a42.zip
Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-dev
Diffstat (limited to 'build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay')
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/etc/rc.local10
1 files changed, 8 insertions, 2 deletions
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/etc/rc.local b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/etc/rc.local
index cdd7966..fe7cfa6 100755
--- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/etc/rc.local
+++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/etc/rc.local
@@ -16,8 +16,14 @@ pacman -S --noconfirm mythdb-initial 2>/dev/null
#search for remote
init_remote
-/root/startx &
-
+echo $CMDLINE | grep -qi NoX
+if [ $? = 0 ]
+then
+ echo "No auto X option found"
+ # /usr/bin/chvt 2
+else
+ /root/startx &
+fi
# Set up automatically logged in user (larch live system only)