Merge remote-tracking branch 'origin/testing' into testing

15 files changed, 28 insertions, 92 deletions

diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
index e5311fd..21c6359 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
@@ -232,3 +232,5 @@ larch-live
 mkinitcpio-busybox
 windowmaker-crm-git
 xcursor-themes
+ceton
+ceton-scripts
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks
index 6791d8f..21c6359 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks
@@ -209,7 +209,7 @@ ntfs-3g
 joyutils
 ffmpeg-svn
 #myth2ipod
-myt2xvid3
+#myt2xvid3 #--unsupported and doesn't work
 #mediaserv
 
 #---Firewire
@@ -226,8 +226,11 @@ mplayer-wrapper
 #atl1e
 
 linux-firmware
+hd3000firmware
 
 larch-live
 mkinitcpio-busybox
 windowmaker-crm-git
 xcursor-themes
+ceton
+ceton-scripts
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/cachepacks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/cachepacks
index 6bf3c73..6ea3023 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/cachepacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/cachepacks
@@ -2,6 +2,8 @@ mythdb-initial
 nvidia
 nvidia-utils
 vdpauinfo
+nvidia-173xx
+nvidia-173xx-utils
 nvidia-96xx
 nvidia-96xx-utils
 #vdpinfo-96xx
@@ -55,5 +57,5 @@ startup-notification
 xulrunner
 #mythmovies
 #myth2ipod
-myt2xvid3
+#myt2xvid3
 #mediaserv
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/pacman.conf.options b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/pacman.conf.options
index d71f787..de6faee 100644
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/pacman.conf.options
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/pacman.conf.options
@@ -19,7 +19,7 @@ SyncFirst   = pacman
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #XferCommand = /usr/bin/curl -C - %u > %o
 #CleanMethod = KeepInstalled
-Architecture = auto
+Architecture = i686
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/modify_chroot.sh b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/modify_chroot.sh
index e635c0e..4b91959 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/modify_chroot.sh
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/modify_chroot.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 echo "larch5" > /etc/hostname
 useradd -m -s /bin/bash mythtv -G audio,video,optical,storage,users
+/usr/sbin/groupadd -g 20 utmp
 cp -rvpf /.post_process/home/mythtv  /home/
 cp -rvpf /.post_process/home/mythtv/.fluxbox /root
 cp -vpf /.post_process/nouveau.conf /etc/modprobe.d/nouveau.conf
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/rc.conf
index 7ab2209..391c913 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/rc.conf
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/rc.conf
@@ -66,47 +66,6 @@ HOSTNAME=`cat /etc/hostname`
 
 #The following is only used on the install. After the first boot everything is set from /etc/net.
 
-
-#
-# Use 'ifconfig -a' or 'ls /sys/class/net/' to see all available
-# interfaces.
-#
-# Interfaces to start at boot-up (in this order)
-# Declare each interface then list in INTERFACES
-#   - prefix an entry in INTERFACES with a ! to disable it
-#   - no hyphens in your interface names - Bash doesn't like it
-#
-# Note: to use DHCP, set your interface to be "dhcp" (eth0="dhcp")
-#
-lo="lo 127.0.0.1"
-#eth0="dhcp"
-INTERFACES=(lo )
-#
-# Routes to start at boot-up (in this order)
-# Declare each route then list in ROUTES
-#   - prefix an entry in ROUTES with a ! to disable it
-#
-gateway="default gw 192.168.0.1"
-ROUTES=(!gateway)
-#
-# Enable these network profiles at boot-up.  These are only useful
-# if you happen to need multiple network configurations (ie, laptop users)
-#   - set to 'menu' to present a menu during boot-up (dialog package required)
-#   - prefix an entry with a ! to disable it
-#
-# Network profiles are found in /etc/network-profiles
-#
-#NET_PROFILES=(main)
-
-#
-# -----------------------------------------------------------------------
-# DAEMONS
-# -----------------------------------------------------------------------
-#
-# Daemons to start at boot-up (in this order)
-#   - prefix a daemon with a ! to disable it
-#   - prefix a daemon with a @ to start it up in the background
-#
 #DAEMONS=(syslog-ng network netfs crond)
-DAEMONS=(fbsplash !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/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks
index 1fa97d7..0f79938 100644
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks
@@ -16,7 +16,7 @@ sysinit_premount_larch() {
     # Add disk partitions to /etc/fstab
     x10d_fstab
 }
-add_hook sysinit_premount sysinit_premount_larch
+#add_hook sysinit_premount sysinit_premount_larch
 
 
 sysinit_end_larch() {
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
index e5311fd..21c6359 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
@@ -232,3 +232,5 @@ larch-live
 mkinitcpio-busybox
 windowmaker-crm-git
 xcursor-themes
+ceton
+ceton-scripts
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks
index 6791d8f..21c6359 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks
@@ -209,7 +209,7 @@ ntfs-3g
 joyutils
 ffmpeg-svn
 #myth2ipod
-myt2xvid3
+#myt2xvid3 #--unsupported and doesn't work
 #mediaserv
 
 #---Firewire
@@ -226,8 +226,11 @@ mplayer-wrapper
 #atl1e
 
 linux-firmware
+hd3000firmware
 
 larch-live
 mkinitcpio-busybox
 windowmaker-crm-git
 xcursor-themes
+ceton
+ceton-scripts
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/cachepacks b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/cachepacks
index 6bf3c73..6ea3023 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/cachepacks
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/cachepacks
@@ -2,6 +2,8 @@ mythdb-initial
 nvidia
 nvidia-utils
 vdpauinfo
+nvidia-173xx
+nvidia-173xx-utils
 nvidia-96xx
 nvidia-96xx-utils
 #vdpinfo-96xx
@@ -55,5 +57,5 @@ startup-notification
 xulrunner
 #mythmovies
 #myth2ipod
-myt2xvid3
+#myt2xvid3
 #mediaserv
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/pacman.conf.options b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/pacman.conf.options
index d71f787..de6faee 100644
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/pacman.conf.options
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/pacman.conf.options
@@ -19,7 +19,7 @@ SyncFirst   = pacman
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #XferCommand = /usr/bin/curl -C - %u > %o
 #CleanMethod = KeepInstalled
-Architecture = auto
+Architecture = i686
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/modify_chroot.sh b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/modify_chroot.sh
index e635c0e..4b91959 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/modify_chroot.sh
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/modify_chroot.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 echo "larch5" > /etc/hostname
 useradd -m -s /bin/bash mythtv -G audio,video,optical,storage,users
+/usr/sbin/groupadd -g 20 utmp
 cp -rvpf /.post_process/home/mythtv  /home/
 cp -rvpf /.post_process/home/mythtv/.fluxbox /root
 cp -vpf /.post_process/nouveau.conf /etc/modprobe.d/nouveau.conf
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/rc.conf
index 7ab2209..391c913 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/rc.conf
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/rc.conf
@@ -66,47 +66,6 @@ HOSTNAME=`cat /etc/hostname`
 
 #The following is only used on the install. After the first boot everything is set from /etc/net.
 
-
-#
-# Use 'ifconfig -a' or 'ls /sys/class/net/' to see all available
-# interfaces.
-#
-# Interfaces to start at boot-up (in this order)
-# Declare each interface then list in INTERFACES
-#   - prefix an entry in INTERFACES with a ! to disable it
-#   - no hyphens in your interface names - Bash doesn't like it
-#
-# Note: to use DHCP, set your interface to be "dhcp" (eth0="dhcp")
-#
-lo="lo 127.0.0.1"
-#eth0="dhcp"
-INTERFACES=(lo )
-#
-# Routes to start at boot-up (in this order)
-# Declare each route then list in ROUTES
-#   - prefix an entry in ROUTES with a ! to disable it
-#
-gateway="default gw 192.168.0.1"
-ROUTES=(!gateway)
-#
-# Enable these network profiles at boot-up.  These are only useful
-# if you happen to need multiple network configurations (ie, laptop users)
-#   - set to 'menu' to present a menu during boot-up (dialog package required)
-#   - prefix an entry with a ! to disable it
-#
-# Network profiles are found in /etc/network-profiles
-#
-#NET_PROFILES=(main)
-
-#
-# -----------------------------------------------------------------------
-# DAEMONS
-# -----------------------------------------------------------------------
-#
-# Daemons to start at boot-up (in this order)
-#   - prefix a daemon with a ! to disable it
-#   - prefix a daemon with a @ to start it up in the background
-#
 #DAEMONS=(syslog-ng network netfs crond)
-DAEMONS=(fbsplash !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/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks
index 1fa97d7..0f79938 100644
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks
@@ -16,7 +16,7 @@ sysinit_premount_larch() {
     # Add disk partitions to /etc/fstab
     x10d_fstab
 }
-add_hook sysinit_premount sysinit_premount_larch
+#add_hook sysinit_premount sysinit_premount_larch
 
 
 sysinit_end_larch() {
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
index e5311fd..21c6359 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
@@ -232,3 +232,5 @@ larch-live
 mkinitcpio-busybox
 windowmaker-crm-git
 xcursor-themes
+ceton
+ceton-scripts