summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCecil Hugh Watson <knoppmyth@gmail.com>2009-09-26 03:21:16 (GMT)
committerCecil Hugh Watson <knoppmyth@gmail.com>2009-09-26 03:21:16 (GMT)
commit632b5c764106d112caa36eeefb3759f9d7c8345b (patch)
tree7de24499f23871c77f07599046506f431f9abfa1
parent4d4488bbddab439d66088b79e14354c4dd87a2ea (diff)
downloadlinhes_dev-632b5c764106d112caa36eeefb3759f9d7c8345b.zip
synce_profile.sh:Added support for syncing release profile.
-rw-r--r--build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/addedpacks85
-rw-r--r--build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cache_packs58
-rw-r--r--build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cd-root/isolinux/debugsub.cfg38
-rw-r--r--build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cd-root/isolinux/hardsub.cfg52
-rw-r--r--build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cd-root/isolinux/isolinux.cfg46
-rw-r--r--build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/mkinitcpio.conf54
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post-process.sh6
-rw-r--r--build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/home/mythtv/.fluxbox/apps4
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/menu.lst6
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/modify_chroot.sh15
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/rc.conf13
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/tweak.sh32
-rw-r--r--build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rcconfx5
-rw-r--r--build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/conf.d/fbsplash.bootsteps1
-rw-r--r--build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/conf.d/fbsplash.conf8
-rw-r--r--build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/conf.d/fbsplash.shutdownsteps1
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/rc.local89
-rw-r--r--build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/root/.fluxbox/apps2
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/root/LinHES-install.sh34
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/root/startx28
-rwxr-xr-xbuild_tools/clarch/sync_profile.sh3
21 files changed, 478 insertions, 102 deletions
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/addedpacks b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/addedpacks
index 6668d64..8e2953d 100644
--- a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/addedpacks
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/addedpacks
@@ -25,11 +25,6 @@ lsof
cdrkit
dvd+rw-tools
-# Needed by the installer
-#python
-
-#base-devel
-#larch
# generally useful tools which don't require X
#mtools is required by syslinux
@@ -40,6 +35,8 @@ alsa-oss
alsa-utils
cdparanoia
cdrdao
+unzip
+
# Xorg packages
xorg-server
@@ -52,6 +49,7 @@ xterm
xorg-fonts-100dpi
xorg-fonts-75dpi
xorg-res-utils
+ttf-ms-fonts
#xorg-video-drivers
xf86-video-amd
@@ -71,6 +69,7 @@ xf86-video-intel
xf86-video-mga
xf86-video-neomagic
xf86-video-nv
+xf86-video-openchrome
xf86-video-radeonhd
xf86-video-rendition
xf86-video-s3
@@ -82,10 +81,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
@@ -93,6 +94,7 @@ xf86-video-voodoo
# X apps
#luser
#localed
+unclutter
#xkmap
@@ -111,14 +113,17 @@ mythmusic
mythphone
myththemes
mythweather
-mythweb
mythvideo
+mythsmolt
+morethemes
+linhes-theme
+linhes-scripts
nuvexport
lirc
lirc-utils
mysql
xmltv
-esd
+esound
#Window Manager
fluxbox
@@ -132,6 +137,10 @@ libcdaudio
iptables
pkgconfig
taglib
+portmap
+ivtv-utils
+dvb-firmware
+dbus-python
#MythVantage Installer deps
bc
@@ -139,15 +148,16 @@ mysql-python
expect
curl
dnsutils
+avahi
#Wireless
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
@@ -160,11 +170,52 @@ rt2x00-rt71w-fw
tiacx
tiacx-firmware
wireless_tools
-wlan-ng26
-wlan-ng26-utils
+#wlan-ng26
+#wlan-ng26-utils
zd1211-firmware
-
+hdhomerun
#----
-live-installer
+LinHES-config
+LinHES-system
+linhes-sounds
etcnet
runit
+runit-scripts
+media_dirs
+
+#---
+tweaker
+ethtool
+nfs-utils
+netkit-telnet
+ntp
+syslog-ng
+ppp
+mingetty
+setserial
+acpid
+fbsplash
+linhes-splash
+nvram-wakup
+tatir
+pvr150-firmware
+wol
+mjpegtools
+perl-net-upnp
+aumix
+tablet-encode
+ntfs-3g
+joyutils
+ffmpeg-svn
+myth2ipod
+myt2xvid3
+mediaserv
+#---Firewire
+libraw1394
+libavc1394
+# wrapper for mplayer
+mplayer-wrapper
+
+# in-place commercial remover (for user job)
+removecommercials
+
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cache_packs b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cache_packs
index b95e6f4..3056a6d 100644
--- a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cache_packs
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cache_packs
@@ -1 +1,59 @@
mythdb-initial
+nvidia
+nvidia-utils
+vdpinfo
+nvidia-96xx
+nvidia-96xx-utils
+vdpinfo-96xx
+lighttpd
+local-website
+mythweb
+nfs-utils
+samba
+mplayer
+xine-ui
+lcdproc
+mythappletrailers
+mythstream
+mythvodka
+oss
+xscreensaver
+tightvnc
+#added from error log
+mysql
+mythnews
+pycairo
+pygobject
+python-numeric
+pygtk
+fam
+sqlite3
+xe
+romdb
+gconf
+gnome-keyring
+gnome-mime-data
+gnome-python
+gnome-python-extras
+gnome-vfs
+hunspell
+libbonobo
+libbonoboui
+libgnome
+libgnomecanvas
+libgnomeui
+libidl2
+miro
+mozilla-common
+nspr
+nss
+orbit2
+policykit
+pyorbit
+pyrex
+startup-notification
+xulrunner
+mythmovies
+myth2ipod
+myt2xvid3
+mediaserv
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cd-root/isolinux/debugsub.cfg b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cd-root/isolinux/debugsub.cfg
new file mode 100644
index 0000000..5ef732d
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/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-RELEASE-REMOTE/cd-root/isolinux/hardsub.cfg b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cd-root/isolinux/hardsub.cfg
new file mode 100644
index 0000000..1d18247
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cd-root/isolinux/hardsub.cfg
@@ -0,0 +1,52 @@
+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 dragon
+MENU LABEL Dragon Version 1
+kernel vmlinuz
+append initrd=larch.img type=dragon vga=0x314 quiet splash=silent,theme:linhes console=tty1
+
+label dragon2
+MENU LABEL Dragon Version 2
+kernel vmlinuz
+append initrd=larch.img type=dragon2 vga=0x314 quiet splash=silent,theme:linhes console=tty1
+
+label ausdragon
+MENU LABEL Australian Dragon
+kernel vmlinuz
+append initrd=larch.img type=ausdragon vga=0x314 quiet splash=silent,theme:linhes console=tty1
+
+label 8400
+MENU LABEL For the Nvidia 8400 chipset.
+kernel vmlinuz
+append initrd=larch.img vga=792 quiet splash=silent,theme:linhes console=tty1 disablemodules=agpart
+
+label goback
+MENU LABEL Back
+kernel vesamenu.c32
+append menu isolinux.cfg
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cd-root/isolinux/isolinux.cfg
index c5eedb8..646b173 100644
--- a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cd-root/isolinux/isolinux.cfg
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/cd-root/isolinux/isolinux.cfg
@@ -1,53 +1,37 @@
default vesamenu.c32
prompt 0
-timeout 50
+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 24
+MENU TIMEOUTROW 23
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=0x314 quiet splash=silent,theme:linhes console=tty1
label linux-nosplash
MENU LABEL LinHES without splash screen.
kernel vmlinuz
append initrd=larch.img
-label linux-splash
-MENU LABEL LinHES with splash screen.
-kernel vmlinuz
-append initrd=larch.img vga=791 quiet splash
-
-label linux-i810
-MENU LABEL with Intel i810 driver (DRI disabled)
-kernel vmlinuz
-append initrd=larch.img i810
-
-label linux-nox
-MENU LABEL Boot to console (without X windowing)
-kernel vmlinuz
-append initrd=larch.img 3
-
-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 special
+MENU LABEL Special Hardware
+kernel vesamenu.c32
+append hardsub.cfg
+label debug
+MENU LABEL Debug options
+kernel vesamenu.c32
+append debugsub.cfg
-label memtest
-MENU LABEL Memory tester
-kernel memtest
+label local
+menu label Boot from ^local drive
+localboot 0xffff
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/mkinitcpio.conf b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/mkinitcpio.conf
new file mode 100644
index 0000000..7279f45
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/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-RELEASE-REMOTE/post-process.sh b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post-process.sh
index 131b907..883d9ad 100755
--- a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post-process.sh
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post-process.sh
@@ -4,9 +4,9 @@ INSTDIR=$1
PROFILE=$2
#everything below this point is specific to MythVantage
-cp -rp $PROFILE/post_process $INSTDIR/.tweak
-chroot $INSTDIR .tweak/tweak.sh
-rm -rf $INSTDIR/.tweak
+cp -rp $PROFILE/post_process $INSTDIR/.post_process
+chroot $INSTDIR .post_process/modify_chroot.sh
+rm -rf $INSTDIR/.post_process
#find the size of the install.
#This is used to calculate progress on the install
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/home/mythtv/.fluxbox/apps b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/home/mythtv/.fluxbox/apps
index 52db7fe..994daf7 100644
--- a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/home/mythtv/.fluxbox/apps
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/home/mythtv/.fluxbox/apps
@@ -1,2 +1,4 @@
+#Uncomment below if you are using firewire
+#[startup] {/usr/bin/plugctl -n 0 "oPCR[0].n_p2pconnections=1"}
[startup] {feh --bg-scale ~/.fluxbox/wallpaper.png}
-[startup] {mythfrontend}
+[startup] {/usr/LH/bin/LinHES-run}
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/menu.lst b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/menu.lst
index ce33757..8a8e3b2 100755
--- a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/menu.lst
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/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=0x314 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=0x314 splash=silent,theme:linhes console=tty1 nox
initrd /boot/kernel26.img
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/modify_chroot.sh b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/modify_chroot.sh
new file mode 100755
index 0000000..6caf191
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/modify_chroot.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+useradd -m -s /bin/bash mythtv -G audio,video,optical,storage,users
+cp -rvpf /.post_process/home/mythtv /home/
+cp -rvpf /.post_process/home/mythtv/.fluxbox /root
+chown -R mythtv.mythtv /home/mythtv/
+chown -R mythtv.mythtv /myth
+
+cp -f /.post_process/hosts.allow /etc/hosts.allow
+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/
+rm -f /etc/ssh/ssh_host*key*
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/rc.conf b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/rc.conf
index 1d5b377..9c17944 100755
--- a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/rc.conf
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/rc.conf
@@ -21,7 +21,7 @@ TIMEZONE="US/Central"
KEYMAP="us"
CONSOLEFONT=
CONSOLEMAP=
-USECOLOR="no"
+USECOLOR="yes"
#
# -----------------------------------------------------------------------
@@ -37,23 +37,23 @@ fi
if [ x$Audiotype = xOSS -a ! -f /tmp/.alsatest ]
then
- ALSABLACKLIST="soundcore"
+ ALSABLACKLIST="!soundcore"
else
if [ x$Audiotype = xOSS ]
then
- ALSABLACKLIST="soundcore"
+ ALSABLACKLIST="!soundcore"
else
ALSABLACKLIST=""
fi
fi
# Module Blacklist - modules in this list will never be loaded by udev
-MOD_BLACKLIST=($ALSABLACKLIST)
+MOD_BLACKLIST_=($ALSABLACKLIST !snd-pcsp )
#
# Modules to load at boot-up (in this order)
# - prefix a module with a ! to blacklist it
#
-MODULES=()
+MODULES=($MOD_BLACKLIST_)
# Scan for LVM volume groups at startup, required if you use LVM
USELVM="no"
@@ -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-RELEASE-REMOTE/post_process/tweak.sh b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/tweak.sh
deleted file mode 100755
index 5c73cf4..0000000
--- a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/post_process/tweak.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-useradd -m -s /bin/bash mythtv -G audio,video,optical,storage,users
-echo 'setting mythtv password to "a" '
-passwd mythtv <<EOF
-a
-a
-EOF
-
-echo 'setting root password to "a" '
-passwd root <<EOF
-a
-a
-EOF
-
-#edit /home/mythtv/.xinitrc and uncomment exec fluxbox
-cp -rvpf /.tweak/home/mythtv /home/
-
-
-
-chown -R mythtv.mythtv /home/mythtv/
-
-
-
-cp -f /.tweak/hosts.allow /etc/hosts.allow
-cp -f /.tweak/securetty /etc/securetty
-cp -f /.tweak/rc.conf /etc/rc.conf
-#cp -f rc.local /etc/rc.local
-#cp -f locale.gen /etc/locale.gen
-
-cp -f /.tweak/rc.shutdown /etc/rc.shutdown
-cp -f /.tweak/menu.lst /boot/grub/menu.lst
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rcconfx b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rcconfx
index 23e671e..fd0d8d3 100644
--- a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rcconfx
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rcconfx
@@ -7,7 +7,8 @@ HARDWARECLOCK="UTC"
TIMEZONE="UTC"
KEYMAP="us"
-MODULES=(floppy)
+#MODULES=(floppy)
+MODULES=(!ati_remote)
HOSTNAME="larch5"
@@ -15,5 +16,5 @@ USELVM="yes"
#eth0="dhcp"
-DAEMONS=(syslog-ng network mysqld dbus hal !slim sshd)
+DAEMONS=(syslog-ng network mysqld dbus hal avahi-daemon !slim sshd)
SPLASH="splashy"
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/conf.d/fbsplash.bootsteps b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/conf.d/fbsplash.bootsteps
new file mode 100644
index 0000000..64bb6b7
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/conf.d/fbsplash.bootsteps
@@ -0,0 +1 @@
+30
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/conf.d/fbsplash.conf b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/conf.d/fbsplash.conf
new file mode 100644
index 0000000..ddd88f8
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/conf.d/fbsplash.conf
@@ -0,0 +1,8 @@
+#
+# fbsplash.conf
+#
+
+THEMES="linhes"
+SPLASH_TTYS="1 2 3 4 5 6"
+
+#EOF
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/conf.d/fbsplash.shutdownsteps b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/conf.d/fbsplash.shutdownsteps
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/conf.d/fbsplash.shutdownsteps
@@ -0,0 +1 @@
+7
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/rc.local b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/rc.local
index 216ec8e..2d488a2 100755
--- a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/rc.local
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/etc/rc.local
@@ -2,15 +2,92 @@
#
# /etc/rc.local: Local multi-user startup script.
#
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/profile
+. ${MV_ROOT}/bin/install_functions.sh
-#install initial database
-pacman -S --noconfirm mythdb-initial 2>/dev/null
+function mysql_check {
+ mysql -e "show databases;" 2>/dev/null >/dev/null
+ return $?
+}
-# Set up automatically logged in user (larch live system only)
+function mythconverg_check {
+ mysql mythconverg -e "describe settings;" 2>/dev/null >/dev/null
+ return $?
+}
+
+function install_db {
+ pacman --noconfirm -R mythdb-initial 2>/dev/null > /dev/null
+ pacman -S --noconfirm mythdb-initial 2>/dev/null > /dev/null
+}
+
+
+
+
+#check to see if mysql is running
+stat_busy "Checking Mysql"
+ATTEMPT=0
+mysql_check && printhl " Installing the initial database" &&install_db
+mythconverg_check
+status=$?
+while [ ! $status = 0 ]
+do
+ ((ATTEMPT=ATTEMPT+1))
+ /etc/rc.d/mysqld stop
+ sleep 2
+ /etc/rc.d/mysqld start
+ mysqlstatus=$?
+ if [ $mysqlstatus = 0 ]
+ then
+ mysql_check && install_db
+ mythconverg_check
+ status=$?
+ fi
+ if [ $ATTEMPT = 20 ]
+ then
+ printhl " Could not start mysql or install mythconverg within 20 attempts"
+ printhl " Aborting install"
+ exit 20
+ fi
+done
+stat_done
+
+#check network parms
+stat_busy "Checking network"
+init_network
+stat_done
+
+stat_busy "Probing network"
+request_dhcp &
+stat_done
+
+#save some cmdline options
+stat_busy "Parsing command line"
+parse_cmdline_2_db
+bootsplash_setup
+stat_done
+
+#search for remote
+stat_busy "Checking for remote"
+init_remote
+stat_done
+printhl "Finished"
+
+
+echo $CMDLINE | grep -qi NoX
+if [ $? = 0 ]
+then
+ echo ""
+ printhl "No auto X option found"
+ # /usr/bin/chvt 2
+else
+ /root/startx &
+fi
+
+
+# Set up automatically logged in user
if [ -f /.livesys/autologin ]; then
cp /.livesys/autologin /tmp/newuser
fi
-# Restore saved sound volume, etc.
-#alsactl restore
-#install initial database
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/root/.fluxbox/apps b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/root/.fluxbox/apps
new file mode 100644
index 0000000..68fae0a
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/root/.fluxbox/apps
@@ -0,0 +1,2 @@
+[startup] {feh --bg-scale ~/.fluxbox/wallpaper.png}
+
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/root/LinHES-install.sh b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/root/LinHES-install.sh
new file mode 100755
index 0000000..6acd24a
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/root/LinHES-install.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+#redirect stderr to stdout, then rediret stdout to file
+. /etc/profile
+exec 2>&1
+exec > /tmp/mythvantage_install.log
+#/usr/bin/nvidia-settings -a InitialPixmapPlacement=2
+#keylaunch &
+#/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)
+echo $CMDLINE |grep -q nfsroot
+NFSROOT=$?
+echo $CMDLINE |grep -q clean_upgrade
+if [ $? = 0 ]
+then
+ export CLEAN_UPGRADE=YES
+else
+ export CLEAN_UPGRADE=NO
+fi
+MythVantage -r
+
+if [ x$NFSROOT = x1 ]
+then
+ unbuffer MythVantage &
+else
+ NETBOOT=YES MythVantage &
+fi
+
+exec fluxbox > /var/log/fluxbox.log 2>&1
diff --git a/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/root/startx b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/root/startx
new file mode 100755
index 0000000..9274703
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-RELEASE-REMOTE/rootoverlay/root/startx
@@ -0,0 +1,28 @@
+#!/bin/bash
+. /etc/profile
+
+export USER=root
+export HOME=/root
+
+CMDLINE=$(cat /proc/cmdline)
+TEMPVAR=${CMDLINE#*ip=}
+IP=${TEMPVAR%% *}
+echo $CMDLINE |grep -q vnc
+USEVNC=$?
+
+if [ x$USEVNC = x1 ]
+then
+ $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 -- -logverbose 6 -config /root/xorg.conf.install -allowMouseOpenFail 2>/tmp/x.log
+ else
+ #VNC
+ pacman -Sf --noconfirm tightvnc
+ cd /root
+ mkdir .vnc
+ echo mythvantage |vncpasswd -f > /root/.vnc/passwd
+ chmod 500 /root/.vnc/passwd
+ rm /root/.vnc/xstartup
+ ln -s /root/LinHES-install.sh /root/.vnc/xstartup
+ vncserver
+fi
diff --git a/build_tools/clarch/sync_profile.sh b/build_tools/clarch/sync_profile.sh
index ed93bd4..c6c5e60 100755
--- a/build_tools/clarch/sync_profile.sh
+++ b/build_tools/clarch/sync_profile.sh
@@ -8,3 +8,6 @@ rsync --exclude=vbg.jpg --exclude=pacman.conf --delete -av larch/profiles/$SRC
DEST_PROFILE=$ARCH-testing-REMOTE
rsync --exclude=vbg.jpg --exclude=pacman.conf --delete -av larch/profiles/$SRC_PROFILE/ larch/profiles/$DEST_PROFILE/
+
+DEST_PROFILE=$ARCH-RELEASE-REMOTE
+rsync --exclude=vbg.jpg --exclude=pacman.conf --delete -av larch/profiles/$SRC_PROFILE/ larch/profiles/$DEST_PROFILE/