diff options
| author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2008-12-02 09:01:33 (GMT) |
|---|---|---|
| committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2008-12-02 09:01:33 (GMT) |
| commit | 56b0ac3ddfdc91139fcbe0e11dc946978ae04a42 (patch) | |
| tree | 6239df4065119b5b7de9c489e16f80022ca900e2 /build_tools/clarch/larch/profiles/i686-testing-local-httpd | |
| parent | 597d7a7a5383da4ba6ec9866e0b70962b68b2417 (diff) | |
| parent | 699d87c76662d820f97a6c4b0ab151fac849770b (diff) | |
| download | linhes_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')
3 files changed, 19 insertions, 3 deletions
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks index 72b0c2d..35a096d 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks @@ -179,3 +179,6 @@ media_dirs tweaker ethtool nfs-utils +netkit-telnet +ntp +syslog-ng diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg index a1a306d..4b41196 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg @@ -27,10 +27,17 @@ MENU LABEL with Intel i810 driver (DRI disabled) kernel vmlinuz append initrd=larch.img i810 + +label linux-vesa +MENU LABEL Force use of vesa driver +kernel vmlinuz +append initrd=larch.img forceXvesa + + 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-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) |