summaryrefslogtreecommitdiffstats
path: root/build_tools/clarch/larch/profiles/i686-testing-REMOTE
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2008-11-23 03:46:47 (GMT)
committerJames Meyer <james.meyer@operamail.com>2008-11-23 03:46:47 (GMT)
commit214e936ce58851fbf3865668be6565e7685fb9ce (patch)
tree4c3b565766737840215ece67c9860e4fa6dbcd7e /build_tools/clarch/larch/profiles/i686-testing-REMOTE
parentac60bb6e91bb906fa7535c91ee8181ea83b3bc77 (diff)
downloadlinhes_dev-214e936ce58851fbf3865668be6565e7685fb9ce.zip
fix noX option
Diffstat (limited to 'build_tools/clarch/larch/profiles/i686-testing-REMOTE')
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg2
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/etc/rc.local10
2 files changed, 9 insertions, 3 deletions
diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg
index a1a306d..fb26dae 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg
+++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg
@@ -30,7 +30,7 @@ append initrd=larch.img i810
label linux-nox
MENU LABEL Boot to console (without X windowing)
kernel vmlinuz
-append initrd=larch.img noX
+append initrd=larch.img NoX
label linux-c2r
MENU LABEL LinHES: copy-to-ram (also activates swap)
diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/etc/rc.local b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/etc/rc.local
index cdd7966..fe7cfa6 100755
--- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/etc/rc.local
+++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/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)