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 | |
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')
12 files changed, 77 insertions, 28 deletions
diff --git a/build_tools/clarch/larch/profiles/MV-local/addedpacks b/build_tools/clarch/larch/profiles/MV-local/addedpacks index f518409..b1b6a2a 100644 --- a/build_tools/clarch/larch/profiles/MV-local/addedpacks +++ b/build_tools/clarch/larch/profiles/MV-local/addedpacks @@ -1,5 +1,6 @@ # These are needed to build a live CD -linhes-live +#linhes-live +mythvantage-live squashfs-tools lzop @@ -121,14 +122,14 @@ syslog-ng ttf-bitstream-vera xine-lib -#syth-lacquer-wide -#Midnight-wide -#Midnight-blue -#basic-blue -#basic-green -#basic-amber -#basic-purple -#basic-red +syth-lacquer-wide +Midnight-wide +Midnight-blue +basic-blue +basic-green +basic-amber +basic-purple +basic-red MythVantage-system diff --git a/build_tools/clarch/larch/profiles/MV-local/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/MV-local/cd-root/isolinux/isolinux.cfg index 6686db4..a4c7998 100644 --- a/build_tools/clarch/larch/profiles/MV-local/cd-root/isolinux/isolinux.cfg +++ b/build_tools/clarch/larch/profiles/MV-local/cd-root/isolinux/isolinux.cfg @@ -24,6 +24,7 @@ KERNEL vmlinuz APPEND vga=normal initrd=larch.img noauto ip=dhcp netdev=eth0 LABEL MythVantage-remote +KERNEL vmlinuz APPEND vga=normal initrd=larch.img noauto ip=dhcp remote=MX-500-jams remoteport=ttyS0 LABEL MythVantage-static-ip @@ -33,6 +34,5 @@ APPEND vga=normal initrd=larch.img noauto vnc ip=192.168.1.222 netmask=255.255. LABEL Boot_from_hardrive localboot 0xffff - MENU ROWS 6 diff --git a/build_tools/clarch/larch/profiles/MV-local/post_process/rc.sysinit.patch b/build_tools/clarch/larch/profiles/MV-local/post_process/rc.sysinit.patch index 69a1ce0..4bdc25f 100644 --- a/build_tools/clarch/larch/profiles/MV-local/post_process/rc.sysinit.patch +++ b/build_tools/clarch/larch/profiles/MV-local/post_process/rc.sysinit.patch @@ -1,14 +1,14 @@ ---- rc.sysinit.orig 2008-07-06 19:39:36.000000000 -0500 -+++ rc.sysinit 2008-07-06 19:40:28.000000000 -0500 -@@ -9,10 +9,7 @@ - source_functions +--- rc.sysinit.orig 2008-11-22 20:47:41.000000000 -0600 ++++ rc.sysinit 2008-11-22 20:48:07.000000000 -0600 +@@ -7,9 +7,8 @@ + . /etc/rc.d/functions echo " " --printhl "Arch Linux $C_OTHER(${C_H2}Core Dump$C_OTHER)\n" --printhl "${C_H2}http://www.archlinux.org" --printhl "Copyright 2002-2007 Judd Vinet" --printhl "Copyright 2007-2008 Aaron Griffin" -+printhl "MythVantage \n" +-printhl "LinHES" +-printhl "The Linux Home Entertainment System" +-printhl "${C_H2}http://www.knoppmyth.net" ++printhl "MythVantage" ++printhl "${C_H2}http://www.mythvantage.com" printhl "Distributed under the GNU General Public License (GPL)" printsep diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks index 72b0c2d..35a096d 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/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-REMOTE/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg index a1a306d..4b41196 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 @@ -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-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) 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) diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks index 72b0c2d..35a096d 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks +++ b/build_tools/clarch/larch/profiles/i686-testing-local/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/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg index 648fe25..44124cf 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg +++ b/build_tools/clarch/larch/profiles/i686-testing-local/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/rootoverlay/etc/rc.local b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local index cdd7966..fe7cfa6 100755 --- a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local +++ b/build_tools/clarch/larch/profiles/i686-testing-local/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) |