summaryrefslogtreecommitdiffstats
path: root/build_tools/clarch/larch/profiles/i686-testing-local
diff options
context:
space:
mode:
Diffstat (limited to 'build_tools/clarch/larch/profiles/i686-testing-local')
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/addedpacks34
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/cache_packs5
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/debugsub.cfg38
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/hardsub.cfg32
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg46
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/vbg.jpgbin52081 -> 44071 bytes
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf54
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-local/post_process/menu.lst6
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-local/post_process/modify_chroot.sh3
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-local/post_process/rc.conf3
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local1
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh6
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx4
13 files changed, 178 insertions, 54 deletions
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks
index c1d8923..e533153 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks
@@ -80,10 +80,12 @@ xf86-video-sisusb
#xf86-video-tdfx
xf86-video-trident
xf86-video-tseng
-xf86-video-unichrome
+#unichrome is busted and causes X to segfault
+#xf86-video-unichrome
xf86-video-v4l
xf86-video-vesa
-xf86-video-vga
+#vga should not be installed, vesa can handle when other drivers fail
+#xf86-video-vga
#xf86-video-via
xf86-video-vmware
xf86-video-voodoo
@@ -112,12 +114,15 @@ myththemes
mythweather
mythvideo
mythsmolt
+morethemes
+linhes-theme
+linhes-scripts
nuvexport
lirc
lirc-utils
mysql
xmltv
-esd
+esound
#Window Manager
fluxbox
@@ -134,6 +139,7 @@ taglib
portmap
ivtv-utils
dvb-firmware
+dbus-python
#MythVantage Installer deps
bc
@@ -147,10 +153,10 @@ avahi
b43-fwcutter
ipw2100-fw
ipw2200-fw
-ipw3945
-ipw3945-ucode
-ipw3945d
-iwlwifi-3945-ucode
+#ipw3945
+#ipw3945-ucode
+#ipw3945d
+#iwlwifi-3945-ucode
iwlwifi-4965-ucode
madwifi
madwifi-utils
@@ -163,13 +169,14 @@ rt2x00-rt71w-fw
tiacx
tiacx-firmware
wireless_tools
-wlan-ng26
-wlan-ng26-utils
+#wlan-ng26
+#wlan-ng26-utils
zd1211-firmware
hdhomerun
#----
LinHES-config
LinHES-system
+linhes-sounds
etcnet
runit
runit-scripts
@@ -182,4 +189,11 @@ nfs-utils
netkit-telnet
ntp
syslog-ng
-mythappletrailers
+ppp
+mingetty
+setserial
+acpid
+fbsplash
+linhes-splash
+nvram-wakup
+tatir
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs b/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs
index e2d2581..6627081 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs
@@ -10,3 +10,8 @@ nfs-utils
samba
mplayer
xine-ui
+lcdproc
+mythappletrailers
+mythstream
+mythvodka
+oss
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/debugsub.cfg b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/debugsub.cfg
new file mode 100644
index 0000000..5ef732d
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/debugsub.cfg
@@ -0,0 +1,38 @@
+default vesamenu.c32
+prompt 0
+#timeout 300
+
+MENU BACKGROUND vbg.jpg
+MENU COLOR border 31;40 #90ffff00 #00000000 std
+MENU COLOR sel 31;47 #00000000 #FFFFFF15 al
+MENU ROWS 4
+MENU CMDLINEROW 22
+#MENU TIMEOUTROW 23
+MENU TABMSGROW 22
+
+MENU TITLE LinHES: The Linux Home Entertainment System
+
+
+label linux-nox
+MENU LABEL Boot to console (without X windowing)
+kernel vmlinuz
+append initrd=larch.img NoX
+
+label linux-c2r
+MENU LABEL LinHES: copy-to-ram (also activates swap)
+kernel vmlinuz
+append initrd=larch.img c2r
+
+label linux-swap
+MENU LABEL LinHES: Use swap
+kernel vmlinuz
+append initrd=larch.img swap
+
+label memtest
+MENU LABEL Memory tester
+kernel memtest
+
+label goback
+MENU LABEL Back
+kernel vesamenu.c32
+append menu isolinux.cfg \ No newline at end of file
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/hardsub.cfg b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/hardsub.cfg
new file mode 100644
index 0000000..d60661a
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/hardsub.cfg
@@ -0,0 +1,32 @@
+default vesamenu.c32
+prompt 0
+#timeout 300
+
+MENU BACKGROUND vbg.jpg
+MENU COLOR border 31;40 #90ffff00 #00000000 std
+MENU COLOR sel 31;47 #00000000 #FFFFFF15 al
+MENU ROWS 4
+MENU CMDLINEROW 22
+MENU TABMSGROW 22
+
+MENU TITLE LinHES: The Linux Home Entertainment System
+
+label atomic
+MENU LABEL LinHES on Atomic Ant!
+kernel vmlinuz
+append initrd=larch.img vga=792 quiet splash=silent,theme:linhes console=tty1 disablemodules=agpart,intel_agp
+
+#label linux-i810
+#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 goback
+MENU LABEL Back
+kernel vesamenu.c32
+append menu isolinux.cfg
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 44124cf..31023c0 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
@@ -13,47 +13,25 @@ MENU TABMSGROW 22
MENU TITLE LinHES: The Linux Home Entertainment System
label linux
-MENU LABEL LinHES with Splashy (default).
+MENU LABEL LinHES (default).
kernel vmlinuz
-append initrd=larch.img vga=791 quiet splash
+append initrd=larch.img vga=792 quiet splash=silent,theme:linhes console=tty1
label linux-nosplash
MENU LABEL LinHES without splash screen.
kernel vmlinuz
append initrd=larch.img
-label linux-i810
-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
-
-label linux-c2r
-MENU LABEL LinHES: copy-to-ram (also activates swap)
-kernel vmlinuz
-append initrd=larch.img c2r
+label special
+MENU LABEL Special Hardware
+kernel vesamenu.c32
+append hardsub.cfg
-label linux-swap
-MENU LABEL LinHES: Use swap
-kernel vmlinuz
-append initrd=larch.img swap
+label debug
+MENU LABEL Debug options
+kernel vesamenu.c32
+append debugsub.cfg
label local
- menu label Boot from ^local drive
- localboot 0xffff
-
-
-label memtest
-MENU LABEL Memory tester
-kernel memtest
+menu label Boot from ^local drive
+localboot 0xffff
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/vbg.jpg b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/vbg.jpg
index e853718..07d31a6 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/vbg.jpg
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/vbg.jpg
Binary files differ
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf b/build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf
new file mode 100644
index 0000000..7279f45
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf
@@ -0,0 +1,54 @@
+# vim:set ft=sh
+# MODULES
+# The following modules are loaded before any boot hooks are
+# run. Advanced users may wish to specify all system modules
+# in this array. For instance:
+# MODULES="piix ide_disk reiserfs"
+MODULES=""
+
+# BINARIES
+# This setting includes, into the CPIO image, and additional
+# binaries a given user may wish. This is run first, so may
+# be used to override the actual binaries used in a given hook.
+# (Existing files are NOT overwritten is already added)
+# BINARIES are dependancy parsed, so you may safely ignore libraries
+#BINARIES=""
+
+# FILES
+# This setting is similar to BINARIES above, however, files are added
+# as-is and are not parsed in anyway. This is useful for config files.
+# Some users may wish to include modprobe.conf for custom module options,
+# like so:
+# FILES="/etc/modprobe.conf"
+FILES=""
+
+# HOOKS
+# This is the most important setting in this file. The HOOKS control the
+# modules and scripts added to the image, and what happens at boot time.
+# Order is important, and it is recommended that you do not change the
+# order in which HOOKS are added. Run 'mkinitcpio -H <hook name>' for
+# help on a given hook.
+# 'base' is _required_ unless you know precisely what you are doing.
+# 'udev' is _required_ in order to automatically load modules
+# 'modload' may be used in place of 'udev', but is not recommended
+# 'filesystems' is _required_ unless you specify your fs modules in MODULES
+# Examples:
+# This setup specifies all modules in the MODULES setting above.
+# No raid, lvm, or encrypted root is needed.
+# HOOKS="base"
+#
+# This setup will autodetect all modules for your system and should
+# work as a sane default
+# HOOKS="base udev autodetect ide scsi sata filesystems"
+#
+# This setup will generate a 'full' image which supports most systems.
+# No autodetection is done.
+# HOOKS="base udev ide scsi sata usb filesystems"
+#
+# This setup assembles an ide raid array with an encrypted root FS.
+# Note: See 'mkinitcpio -H raid' for more information on raid devices.
+# HOOKS="base udev ide filesystems raid encrypt"
+#
+# This setup loads an LVM volume group on a usb device.
+# HOOKS="base udev usb filesystems lvm"
+HOOKS="base udev pata scsi sata usb larch1 larch2_aufs larch3 fbsplash"
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/post_process/menu.lst b/build_tools/clarch/larch/profiles/i686-testing-local/post_process/menu.lst
index ce33757..ab2bc95 100755
--- a/build_tools/clarch/larch/profiles/i686-testing-local/post_process/menu.lst
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/post_process/menu.lst
@@ -43,13 +43,13 @@ initrd /boot/kernel26.img
# (1) bootsplash
title LinHes-splashy
root (hd0,0)
-kernel /boot/vmlinuz26 root=/dev/hda1 ro init=/sbin/runit quiet vga=0x318 splash=silent,theme:darch console=tty1
+kernel /boot/vmlinuz26 root=/dev/hda1 ro init=/sbin/runit quiet vga=0x318 splash=silent,theme:linhes console=tty1
initrd /boot/kernel26.img
# (2) noautologin
-title STB-nologin
+title LinHES-nologin
root (hd0,0)
-kernel /boot/vmlinuz26 root=/dev/hda1 ro init=/sbin/runit quiet vga=0x318 splash=silent,theme:darch console=tty1 noautologin
+kernel /boot/vmlinuz26 root=/dev/hda1 ro init=/sbin/runit quiet vga=0x318 splash=silent,theme:linhes console=tty1 noautologin
initrd /boot/kernel26.img
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/post_process/modify_chroot.sh b/build_tools/clarch/larch/profiles/i686-testing-local/post_process/modify_chroot.sh
index 868620d..07af9fb 100755
--- a/build_tools/clarch/larch/profiles/i686-testing-local/post_process/modify_chroot.sh
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/post_process/modify_chroot.sh
@@ -11,4 +11,5 @@ cp -f /.post_process/rc.conf /etc/rc.conf
cp -f /.post_process/rc.shutdown /etc/rc.shutdown
cp -f /.post_process/menu.lst /boot/grub/menu.lst
-cp -f /etc/skel/.bash* /root/ \ No newline at end of file
+cp -f /etc/skel/.bash* /root/
+rm -f /etc/ssh/ssh_host*key*
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/post_process/rc.conf b/build_tools/clarch/larch/profiles/i686-testing-local/post_process/rc.conf
index 856b0be..499e38c 100755
--- a/build_tools/clarch/larch/profiles/i686-testing-local/post_process/rc.conf
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/post_process/rc.conf
@@ -108,6 +108,5 @@ ROUTES=(!gateway)
# - prefix a daemon with a @ to start it up in the background
#
#DAEMONS=(syslog-ng network netfs crond)
-DAEMONS=(!syslog-ng !hotplug !pcmcia network mysqld dbus avahi-daemon)
-
+DAEMONS=(fbsplash !syslog-ng !hotplug !pcmcia network !mysqld !dbus !avahi-daemon)
# End of file
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 f662a73..059c4bf 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
@@ -55,6 +55,7 @@ done
#search for remote
init_remote
+splash_setup
echo $CMDLINE | grep -qi NoX
if [ $? = 0 ]
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh
index 85762da..6acd24a 100755
--- a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh
@@ -8,7 +8,8 @@ exec > /tmp/mythvantage_install.log
#/usr/bin/tilda &
#/usr/X11R6/bin/unclutter -root -idle 0 -jitter 400 -noevents &
export MALLOC_CHECK_=0
-
+xset s off
+xset -dpms
xhost +
CMDLINE=$(cat /proc/cmdline)
@@ -21,6 +22,7 @@ then
else
export CLEAN_UPGRADE=NO
fi
+MythVantage -r
if [ x$NFSROOT = x1 ]
then
@@ -29,4 +31,4 @@ else
NETBOOT=YES MythVantage &
fi
-exec fluxbox
+exec fluxbox > /var/log/fluxbox.log 2>&1
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx
index 304b722..58858d8 100755
--- a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx
@@ -12,9 +12,9 @@ USEVNC=$?
if [ x$USEVNC = x1 ]
then
- $MV_ROOT/bin/xconfig.sh
+ $MV_ROOT/bin/xconfig.sh 2>/dev/null
cat /etc/X11/xorg.conf | sed -e 's/dev\/mouse/dev\/psaux/g'> /root/xorg.conf.install
- startx /root/LinHES-install.sh -- -config /root/xorg.conf.install -allowMouseOpenFail
+ startx /root/LinHES-install.sh -- -config /root/xorg.conf.install -allowMouseOpenFail 2>/tmp/x.log
else
#VNC
pacman -Sf --noconfirm tightvnc