Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD

Conflicts:
	abs/core-testing/LinHES-config/LinHES-release

14 files changed, 866 insertions, 47 deletions

diff --git a/abs/core-testing/LinHES-config/LinHES-release b/abs/core-testing/LinHES-config/LinHES-release
index c63627b..fc10c90 100644
--- a/abs/core-testing/LinHES-config/LinHES-release
+++ b/abs/core-testing/LinHES-config/LinHES-release
@@ -1 +1,5 @@
-LinHES R6.00.04
+<<<<<<< HEAD:abs/core-testing/LinHES-config/LinHES-release
+LinHES R6.00.05
+=======
+LinHES R6.00.04 
+>>>>>>> origin/HEAD:abs/core-testing/LinHES-config/LinHES-release
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 706dc4c..543d182 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=1.0
-pkgrel=60
+pkgrel=103
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
 pkgdesc="Install and configure your system"
 depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan )
diff --git a/abs/core-testing/LinHES-config/install_functions.sh b/abs/core-testing/LinHES-config/install_functions.sh
index 3e7f8f8..d976dbb 100755
--- a/abs/core-testing/LinHES-config/install_functions.sh
+++ b/abs/core-testing/LinHES-config/install_functions.sh
@@ -35,7 +35,7 @@ update_db_settings Theme "$pick"
 
 
 function setupremote {
-    [ -e $BASE/etc/lircd.conf ] && mv -f $BASE/etc/lircd.conf $BASE/etc/lircd.conf.`date +%Y-%m-%d-%H-%M` 
+    [ -e $BASE/etc/lircd.conf ] && mv -f $BASE/etc/lircd.conf $BASE/etc/lircd.conf.`date +%Y-%m-%d-%H-%M`
     if [ -d $TEMPLATES/remotes/$Remotetype ]
     then
             cd $TEMPLATES/remotes/$Remotetype
@@ -50,16 +50,40 @@ function setupremote {
 	    echo "Starting with support for $Remotetype"
 	    if [ x$Remotetype = "xdvico" ]
 	    then
-	            /usr/sbin/lircd  -d /dev/usb/hiddev0 
+	            /usr/sbin/lircd  -d /dev/usb/hiddev0
 	    else
 	            /usr/sbin/lircd  -d /dev/lirc0
 	    fi
 	    [ -e /root/.mythtv ] ||  mkdir /root/.mythtv 2>/dev/null
-            ln -s /etc/lircrc /root/.mythtv/lircrc 2>/dev/null
+        ln -s /etc/lircrc /root/.mythtv/lircrc 2>/dev/null
+    else
+        echo "Couldn't open directory $TEMPLATES/remotes/$Remotetype"
     fi
 }
 
+function scan_for_hpg_receiver() {
+echo "Scanning for Hauppauge receiver"
+for hpgid in `lspci -nm  -d4444: |cut -d" " -f6-  |tr -d '"'|tr " " :`
+do
+    line=`grep $hpgid $TEMPLATES/remotes/i2c.id`
+    if [ $? = 0 ]
+    then
+        modprobe lirc_i2c
+        FoundReceiverType=`echo "$line"|cut -d"|" -f2`
+        Remotetype=`echo "$line"|cut -d"|" -f4`
+        statusline=`echo "$line"|cut -d"|" -f2,4`
+        echo "Found $statusline , $Remotetype"
+        update_db_settings  HostReceiverType $FoundReceiverType
+        setupremote
+        break
+    fi
+
+done
+}
+
+
 function scan_for_usb_remote () {
+found_remote=1
 echo "Scanning for usb receiver/remote"
 while read line
 do
@@ -68,11 +92,16 @@ do
     if [ $? = 0 ]
     then
         Remotetype=`echo "$line"|cut -d"|" -f2`
-        echo "found $Remotetype"
+        echo "Found $Remotetype"
         setupremote
+        found_remote=0
         break
     fi
 done <$BASE/$TEMPLATES/remotes/receiver_usb.id
+if [ $found_remote = 1 ]
+then
+    scan_for_hpg_receiver
+fi
 }
 
 function rest_of_network () {
diff --git a/abs/core-testing/LinHES-config/install_proxy.sh b/abs/core-testing/LinHES-config/install_proxy.sh
index f106b50..e6b0976 100755
--- a/abs/core-testing/LinHES-config/install_proxy.sh
+++ b/abs/core-testing/LinHES-config/install_proxy.sh
@@ -436,6 +436,8 @@ echo "-----------------------------------------------------------------------3--
 
                                 check_self)
                                             myipdefault=`ifconfig  | grep -C1 $default_interface| grep -v $default_interface | cut -d: -f2 | awk '{ print $1}'`
+                                            echo "network check myself"
+                                            ifconfig 
                                             ping -c 1 $myipdefault
                                                     if [ ! $? = 0 ]
                                                     then
@@ -445,7 +447,10 @@ echo "-----------------------------------------------------------------------3--
                                 ;;
                                 check_gw)
                                             #check gateway
-                                            mygwdefault=`/sbin/route |grep $default_interface|grep UG|awk '{ print $2}'`
+                                            echo "network check gateway"
+                                            /sbin/route -n 
+                                            mygwdefault=`/sbin/route -n  |grep $default_interface|grep UG|awk '{ print $2}'`
+                                            echo "Default gateway seems to be $mygwdefault"
 					                        if  [ !  x$mygwdefault = x ]
 					                        then
 	                                            ping -c 1 $mygwdefault
@@ -457,6 +462,7 @@ echo "-----------------------------------------------------------------------3--
                                 ;;
                                 check_ns)
                                             #check nameserver
+                                                    echo " network check nameserver"
                                                     mydns=`cat /etc/resolv.conf|grep nameserver|head -1|awk '{ print $2}'`
                                                     ping -c 1 $mydns
                                                     if [ ! $? = 0 ]
@@ -465,6 +471,7 @@ echo "-----------------------------------------------------------------------3--
                                                     fi
                                 ;;
                                 check_names)
+                                            echo "network check resolve names"
                                             host google.com
                                             if [ ! $? = 0 ]
                                             then
@@ -474,7 +481,7 @@ echo "-----------------------------------------------------------------------3--
                                 host_names)
                                             #if host is found, then check to see if it's online
                                             #if not online, assume it's ok to use this hostname
-
+                                            echo "network check my hostname $hostname"
                                             hout=`host $hostname`
                                             status=$?
                                             #found host, now grab the ip
diff --git a/abs/core-testing/LinHES-config/myth_user_call b/abs/core-testing/LinHES-config/myth_user_call
index d95e468..0479895 100644
--- a/abs/core-testing/LinHES-config/myth_user_call
+++ b/abs/core-testing/LinHES-config/myth_user_call
@@ -63,7 +63,14 @@ function pass_change() {
 
 
 function web_security {
-    echo "this is just a stub"
+
+    grep -q ${USERNAME}: /etc/lighttpd/lighttpd.user
+    if [ $? = 0 ]
+    then
+            #delete user
+            sed -i "/${USERNAME}\:/d"  /etc/lighttpd/lighttpd.user
+    fi
+    echo "${USERNAME}:${PASSWORD}" >> /etc/lighttpd/lighttpd.user
 
 }
 
@@ -155,7 +162,8 @@ case $OPERATION in
             then
                 print_help
             fi
-            echo "adding webUSERNAME $USERNAME with $PASS"
+            echo "adding webUSERNAME $USERNAME with pass $PASSWORD"
+	    web_security
             ;;
     *)  print_help
         ;;
diff --git a/abs/core-testing/LinHES-config/networkconfig.sh b/abs/core-testing/LinHES-config/networkconfig.sh
index 61a7405..23e3774 100644
--- a/abs/core-testing/LinHES-config/networkconfig.sh
+++ b/abs/core-testing/LinHES-config/networkconfig.sh
@@ -6,7 +6,7 @@ ETCNETDIR=$BASE/etc/net/ifaces
 
 
 
-function kill_dhcp () 
+function kill_dhcp ()
 {
 for i in ${BASE}/etc/dhcpc/dhcpcd-*.pid
 do
@@ -19,12 +19,12 @@ do
     if [ x$1 = xflush ]
     then
         for ifdev in eth0 wlan0 eth1 wlan1
-        do 
+        do
            echo ${i} |grep $ifdev
            status=$?
            if [ $status = 1 ]
            then
-             ip address flush $ifdev   
+             ip address flush $ifdev
            fi
         done
     fi
@@ -43,6 +43,22 @@ fi
 
 }
 
+function change_iface_state () {
+    if [  x$2 =  xenabled ]
+    then
+            echo "setting $1 to active"
+            sed -i -e 's/^ONBOOT=.*$/ONBOOT=yes/g' $ETCNETDIR/$1/options
+            sed -i -e 's/^DISABLED=.*$/DISABLED=no/g' $ETCNETDIR/$1/options
+    else
+            echo "setting $1 to inactive"
+            sed -i -e 's/^ONBOOT=.*$/ONBOOT=no/g' $ETCNETDIR/$1/options
+            sed -i -e 's/^DISABLED=.*$/DISABLED=yes/g' $ETCNETDIR/$1/options
+            /sbin/ifconfig $1 down
+            ip address flush $1
+    fi
+
+}
+
 function setup_interfaces() {
   local IS_WIRELESS
   local ip
@@ -65,7 +81,7 @@ function setup_interfaces() {
   TEMPNET=Hostnetmask$1
   eval netmask=\$${TEMPNET}
   netmask=`echo "$netmask" | cut -d " " -f1`
-  
+
   TEMPNET=HostActive$1
   eval isactive=\$${TEMPNET}
 
@@ -78,24 +94,28 @@ function setup_interfaces() {
   TEMPNET=HostGW$1
   eval GW=\$${TEMPNET}
 
+  TEMPNET=HOST_iswireless$1
+  eval wireless=\$${TEMPNET}
+
+
 
 
-  if [ $1 = wlan0 -o  $1 = wlan1 ]
+  if [ x$wireless = x1  ]
   then
     IS_WIRELESS=TRUE
     TEMPNET=HostESSID$1
     eval ESSID=\$${TEMPNET}
-    
+
     TEMPNET="HostKey"$1
     eval KEY=\$${TEMPNET}
-    
+
     TEMPNET=HostUseEncryption$1
     eval ENCRYPT=\$${TEMPNET}
   fi
-  
+
 
   echo "Setup $1 in progress, wireless: $IS_WIRELESS"
-    
+
     if [ ! -d $ETCNETDIR/$1 ]
     then
         mkdir -p $ETCNETDIR/$1
@@ -106,14 +126,17 @@ function setup_interfaces() {
         cp -f  $TEMPLATES/etcnet/eth/options $ETCNETDIR/$1/options
     fi
 
-    if [ x$isactive =  x0 ]
+    if [  x$isactive =  x1 ]
     then
-            echo "setting $1 to inactive"
-            sed -i -e 's/^ONBOOT=.*$/ONBOOT=no/g' $ETCNETDIR/$1/options
-            
+            change_iface_state $1 enabled
+            #echo "setting $1 to active"
+            #sed -i -e 's/^ONBOOT=.*$/ONBOOT=yes/g' $ETCNETDIR/$1/options
+            #sed -i -e 's/^DISABLED=.*$/DISABLED=no/g' $ETCNETDIR/$1/options
     else
-            echo "setting $1 to active"
-            sed -i -e 's/^ONBOOT=.*$/ONBOOT=yes/g' $ETCNETDIR/$1/options
+            change_iface_state $1 disabled
+            #echo "setting $1 to inactive"
+            #sed -i -e 's/^ONBOOT=.*$/ONBOOT=no/g' $ETCNETDIR/$1/options
+            #sed -i -e 's/^DISABLED=.*$/DISABLED=yes/g' $ETCNETDIR/$1/options
     fi
 
     if [ x$IS_WIRELESS =  xTRUE ]
@@ -126,7 +149,7 @@ function setup_interfaces() {
             then
                 echo "key $KEY" >>  $ETCNETDIR/$1/iwconfig
             fi
-            
+
     else
             echo "disabling wireless"
             sed -i -e 's/^CONFIG_WIRLESS=.*$/CONFIG_WIRLESS=no/g' $ETCNETDIR/$1/options
@@ -135,11 +158,11 @@ function setup_interfaces() {
 
 
 
-    if [ $UseDHCP = 0 ]
+    if [ x$UseDHCP = x0 ]
     then
             echo using dhcp
             sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=dhcp/g' $ETCNETDIR/$1/options
-            
+
     else
         echo "using static ip"
         sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=static/g' $ETCNETDIR/$1/options
@@ -160,15 +183,20 @@ if [ x$MYTHDHCP =  x1 ]
                  echo "nameserver 127.0.0.1" >> ${BASE}/etc/resolv.conf
  fi
 
-for i in eth0 eth1 wlan0 wlan1 
+for i in eth0 eth1 wlan0 wlan1
 do
     CURRENTIF="HostActive"$i
     eval IFSTATE=\$${CURRENTIF}
+    echo $IFSTATE "---"
+        echo $i
     if [ x$IFSTATE = x1 ]
     then
         setup_interfaces $i
+    else
+        change_iface_state $i disabled
     fi
 done
+
 }
 
 function setup_hostname {
@@ -219,33 +247,35 @@ function setup_MYTH_vars {
     TEMPMYTH="Hostip"$default_interface
     #echo $TEMPMYTH
     eval MYTHIP=\$${TEMPMYTH}
-    
+
     TEMPMYTH="HostUSEDHCP"$default_interface
     eval MYTHDHCP=\$${TEMPMYTH}
 
-    
+
 
 }
 
 
 
-function setup_network {
-    setup_MYTH_vars
-    setup_hostname
-    find_active
-}
 
 function start_network {
 if [ ! $USEVNC = 0 ]
 then
+    /etc/net/scripts/network.init reload
     /etc/net/scripts/network.init restart
-
 else
     echo "VNC/NETBOOT in use, will NOT restart network"
 fi
 
 }
 
+function setup_network {
+    setup_MYTH_vars
+    setup_hostname
+    find_active
+}
+
+
 function stop_network {
 if [ ! $USEVNC = 0 ]
 then
diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh
index 6c72b92..3aac497 100755
--- a/abs/core-testing/LinHES-config/systemconfig.sh
+++ b/abs/core-testing/LinHES-config/systemconfig.sh
@@ -163,13 +163,20 @@ function setupreceiver {
     Serial) echo "setup serial lirc"
             sed -i -e '/.*#lirc/d' ${BASE}/etc/modules.mythvantage
             echo "lirc_serial   #lirc" >> ${BASE}/etc/modules.mythvantage
-            /usr/bin/load-modules-mythvantage.sh
+            load-modules-mythvantage.sh
             ;;
     Usb-imon) echo "setup receiver-usb-imon"
               sed -i -e '/.*#lirc/d' ${BASE}/etc/modules.mythvantage
               echo "lirc_imon     #lirc" >> ${BASE}/etc/modules.mythvantage
-              /usr/bin/load-modules-mythvantage.sh
+              load-modules-mythvantage.sh
               ;;
+   Hauppauge) echo "setup hauppauge reciever (lirc_i2c)"
+              sed -i -e '/.*#lirc/d' ${BASE}/etc/modules.mythvantage
+              echo "lirc_i2c   #lirc" >> ${BASE}/etc/modules.mythvantage
+              cp $TEMPLATES/modules/lirc_i2c.conf ${BASE}/etc/modprobe.d/lirc_i2c.conf
+              rmmod lirc_i2c 2>/dev/null
+              load-modules-mythvantage.sh
+             ;;
            *)   sed -i -e '/.*#lirc/d' ${BASE}/etc/modules.mythvantage
               ;;
     esac
@@ -210,7 +217,7 @@ function setupremote {
 			if [ ! -d /home/mythtv/.mythtv ]
 			then
 				mkdir /home/mythtv/.mythtv
-				chown mythtv:mythtv /home/mythtv/.mythtv	
+				chown mythtv:mythtv /home/mythtv/.mythtv
 			fi
 
 			ln -s /etc/lircrc /home/mythtv/.mythtv/lircrc 2> /dev/null
@@ -220,7 +227,7 @@ function setupremote {
 
 			ln -s /etc/lircrc /home/mythtv/.lircrc 2> /dev/null
 		fi
-		
+
 
                 ;;
 esac
@@ -272,7 +279,7 @@ function setupLCD {
             ;;
     xno_lcd) echo "disabling lcd"
             sv down lcdd
-            /usr/bin/load-modules-mythvantage.sh  UNLOAD LCD
+            load-modules-mythvantage.sh  UNLOAD LCD
             sed -i -e '/.*#LCD/d' ${BASE}/etc/modules.mythvantage
             daemon_remove="lcdd $daemon_remove"
             ;;
@@ -292,7 +299,7 @@ function setupLCD {
                 cp -f $TEMPLATES/LCD/$LCDtype/LCDd.conf /etc
                # install="lcdproc $install"
                 daemon_add="lcdd $daemon_add"
-                /usr/bin/load-modules-mythvantage.sh
+                load-modules-mythvantage.sh
                 RESTART_FE="true"
                 RESTART_LCD="true"
             fi
@@ -658,6 +665,14 @@ then
            ser_remove="ncid $ser_remove"
  fi
 
+
+if [ x$UseEvrouter = x1 ]
+then
+           ser_install="evrouter Xvfb $ser_install"
+  else
+           ser_remove="evrouter $ser_remove"
+fi
+
 #Setting the default, just to avoid the or statement..
 #if [ x$UseHobbit = x ]
 #then
@@ -973,6 +988,18 @@ do
 done
 }
 
+function setup_web_auth {
+    if [ x$UseMythWEB_auth = x1 ]
+    then
+        #enable auth
+        sed -ie "s/^.*include.*auth-inc.conf.*$/include \"\/etc\/lighttpd\/auth-inc.conf\"/g" /etc/lighttpd/lighttpd.conf
+    else
+         #disable auth
+        sed -ie "s/^.*include.*auth-inc.conf.*$/#include \"\/etc\/lighttpd\/auth-inc.conf\"/g" /etc/lighttpd/lighttpd.conf
+    fi
+    sudo sv restart lighttpd
+
+}
 
 #----------------------------------------------------MAIN PROGRAM-------------------------------------------
 #misc,sleep,hostype,advanced,audio
@@ -1004,6 +1031,8 @@ for i in  $LIST
 		;;
     advancedX)  showX="true"
       ;;
+      webuser)  setup_web_auth
+      ;;
     restartfe)  killall -9 mythfrontend
                     killall -9 mythwelcome
                     exit 0
@@ -1052,6 +1081,7 @@ then
         then
             echo "loading network"
             ${BASE}/etc/net/scripts/network.init reload
+            ${BASE}/etc/net/scripts/network.init restart
         else
             echo "netboot, will not start network"
         fi
@@ -1269,6 +1299,6 @@ case $SystemType in
             ;;
 esac
 echo $MVRELEASE > /etc/os_myth_release
-echo "systemtype=$smoltsystem" > /data/home/mythtv/.mythtv/smolt.info
-echo "remote=$Remotetype" >> /data/home/mythtv/.mythtv/smolt.info
+echo "systemtype=$smoltsystem" > /home/mythtv/.mythtv/smolt.info 2>/dev/null
+echo "remote=$Remotetype" >> /home/mythtv/.mythtv/smolt.info 2>/dev/null
 
diff --git a/abs/core-testing/LinHES-config/templates/modules/lirc_i2c.conf b/abs/core-testing/LinHES-config/templates/modules/lirc_i2c.conf
new file mode 100644
index 0000000..7b99f78
--- /dev/null
+++ b/abs/core-testing/LinHES-config/templates/modules/lirc_i2c.conf
@@ -0,0 +1,2 @@
+alias char-major-61 lirc_i2c
+options lirc_i2c debug=0 minor=3	
diff --git a/abs/core-testing/LinHES-config/templates/remotes/hauppauge-grey/lircd.conf b/abs/core-testing/LinHES-config/templates/remotes/hauppauge-grey/lircd.conf
new file mode 100644
index 0000000..c0849ef
--- /dev/null
+++ b/abs/core-testing/LinHES-config/templates/remotes/hauppauge-grey/lircd.conf
@@ -0,0 +1,199 @@
+#
+# this config file was automatically generated
+# using lirc-0.5.5pre8 on Sun Apr 18 11:43:45 1999
+#
+# contributed by Jens Leuschner <leuschner@gmx.net>
+#
+# brand:             Hauppauge
+# model:             
+# supported devices: WinTV primo; WinTV pci; WinTV radio
+#
+# This config file will work with both homebrew receivers and 
+# original Hauppauge TV cards !!!
+#
+
+begin remote
+
+  name  Hauppauge
+  bits           13
+  flags SHIFT_ENC
+  eps            30
+  aeps          100
+
+  one           950   830
+  zero          950   830
+  plead         960
+  gap          89584
+  repeat_bit      2
+
+      begin codes
+          TV                       0x000000000000100F
+          RADIO                    0x000000000000100C
+          FULL_SCREEN              0x000000000000102E
+          CH+                      0x0000000000001020
+          CH-                      0x0000000000001021
+          VOL-                     0x0000000000001011
+          VOL+                     0x0000000000001010
+          MUTE                     0x000000000000100D
+          SOURCE                   0x0000000000001022
+          1                        0x0000000000001001
+          2                        0x0000000000001002
+          3                        0x0000000000001003
+          4                        0x0000000000001004
+          5                        0x0000000000001005
+          6                        0x0000000000001006
+          7                        0x0000000000001007
+          8                        0x0000000000001008
+          9                        0x0000000000001009
+          0                        0x0000000000001000
+          RESERVED                 0x000000000000101E
+          MINIMIZE                 0x0000000000001026
+      end codes
+
+end remote
+
+
+#
+# this config file was automatically generated
+# using lirc-0.6.6(animax) on Tue Apr 15 19:50:27 2003
+#
+# contributed by 
+#
+# brand: 				Hauppauge
+# model no. of remote control: 
+# devices being controlled by this remote: PVR 2/350
+#
+
+begin remote
+
+  name  hauppauge_pvr
+  bits           13
+  flags RC5|CONST_LENGTH
+  eps            30
+  aeps          100
+
+  one           969   811
+  zero          969   811
+  plead        1097
+  gap          114605
+  toggle_bit      2
+
+
+      begin codes
+          Power                    0x00000000000017FD
+          Go                       0x00000000000017FB
+          1                        0x00000000000017C1
+          2                        0x00000000000017C2
+          3                        0x00000000000017C3
+          4                        0x00000000000017C4
+          5                        0x00000000000017C5
+          6                        0x00000000000017C6
+          7                        0x00000000000017C7
+          8                        0x00000000000017C8
+          9                        0x00000000000017C9
+          Back/Exit                0x00000000000017DF
+          0                        0x00000000000017C0
+          Menu                     0x00000000000017CD
+          Red                      0x00000000000017CB
+          Green                    0x00000000000017EE
+          Yellow                   0x00000000000017F8
+          Blue                     0x00000000000017E9
+          Ch+                      0x00000000000017E0
+          Ch-                      0x00000000000017E1
+          Vol-                     0x00000000000017D1
+          Vol+                     0x00000000000017D0
+          Ok                       0x00000000000017E5
+          Mute                     0x00000000000017CF
+          Blank                    0x00000000000017CC
+          Full                     0x00000000000017FC
+          Rewind                   0x00000000000017F2
+          Play                     0x00000000000017F5
+          Forward                  0x00000000000017F4
+          Record                   0x00000000000017F7
+          Stop                     0x00000000000017F6
+          Pause                    0x00000000000017F0
+          Replay                   0x00000000000017E4
+          Skip                     0x00000000000017DE
+      end codes
+
+end remote
+
+
+#
+# this config file was automatically generated
+# using lirc-0.7.0(any) on Sun Nov 28 20:25:09 2004
+#
+# contributed by 
+#
+# brand:   Hauppauge 350
+# Created: G.J. Werler (The Netherlands)
+# Project: Mythtv Fedora Pundit-R www.mythtvportal.com
+# Date:    2004/11/28
+# model no. of remote control: Hauppauge A415-HPG
+# devices being controlled by this remote: PVR-350
+#
+
+begin remote
+
+  name  Hauppauge_350
+  bits           13
+  flags RC5|CONST_LENGTH
+  eps            30
+  aeps          100
+
+  one           969   811
+  zero          969   811
+  plead        1097
+  gap          114605
+  toggle_bit      2
+
+
+      begin codes
+          Go                       0x00000000000017BB
+          Power                    0x00000000000017BD
+          TV                       0x000000000000179C
+          Videos                   0x0000000000001798
+          Music                    0x0000000000001799
+          Pictures                 0x000000000000179A
+          Guide                    0x000000000000179B
+          Radio                    0x000000000000178C
+          Up                       0x0000000000001794
+          Left                     0x0000000000001796
+          Right                    0x0000000000001797
+          Down                     0x0000000000001795
+          OK                       0x00000000000017A5
+          Back/Exit                0x000000000000179F
+          Menu/i                   0x000000000000178D
+          Vol+                     0x0000000000001790
+          Vol-                     0x0000000000001791
+          Prev.Ch                  0x0000000000001792
+          Mute                     0x000000000000178F
+          Ch+                      0x00000000000017A0
+          Ch-                      0x00000000000017A1
+          Record                   0x00000000000017B7
+          Stop                     0x00000000000017B6
+          Rewind                   0x00000000000017B2
+          Play                     0x00000000000017B5
+          Forward                  0x00000000000017B4
+          Replay/SkipBackward      0x00000000000017A4
+          Pause                    0x00000000000017B0
+          SkipForward              0x000000000000179E
+          1                        0x0000000000001781
+          2                        0x0000000000001782
+          3                        0x0000000000001783
+          4                        0x0000000000001784
+          5                        0x0000000000001785
+          6                        0x0000000000001786
+          7                        0x0000000000001787
+          8                        0x0000000000001788
+          9                        0x0000000000001789
+          Asterix                  0x000000000000178A
+          0                        0x0000000000001780
+          #                        0x000000000000178E
+          Red                      0x000000000000178B
+          Green                    0x00000000000017AE
+          Yellow                   0x00000000000017B8
+          Blue                     0x00000000000017A9
+      end codes
+
+end remote
diff --git a/abs/core-testing/LinHES-config/templates/remotes/hauppauge-grey/lircrc b/abs/core-testing/LinHES-config/templates/remotes/hauppauge-grey/lircrc
new file mode 100644
index 0000000..2f1e514
--- /dev/null
+++ b/abs/core-testing/LinHES-config/templates/remotes/hauppauge-grey/lircrc
@@ -0,0 +1,505 @@
+# lircrc.example.HauppaugeGrey-nativelirc
+# 2003-09-17, Robert Kulagowski
+# mailto:rkulagow@rocketmail.com
+# Save this file in ~/.mythtv/lircrc
+
+begin
+    prog = mythtv
+    button = Power
+    config = Esc
+end
+
+begin
+    prog = mythtv
+    button = Go
+# Swap the PiP windows
+    config = N
+end
+
+begin
+    prog = mythtv
+    button = 1
+    config = 1
+end
+
+begin
+    prog = mythtv
+    button = 2
+    config = 2
+end
+
+begin
+    prog = mythtv
+    button = 3
+    config = 3
+end
+
+begin
+    prog = mythtv
+    button = 4
+    config = 4
+end
+
+begin
+    prog = mythtv
+    button = 5
+    config = 5
+end
+
+begin
+    prog = mythtv
+    button = 6
+    config = 6
+end
+
+begin
+    prog = mythtv
+    button = 7
+    config = 7
+end
+
+begin
+    prog = mythtv
+    button = 8
+    config = 8
+end
+
+begin
+    prog = mythtv
+    button = 9
+    config = 9
+end
+
+begin
+    prog = mythtv
+    button = Back/Exit
+    config = Esc
+end
+
+begin
+    prog = mythtv
+    button = 0
+    config = 0
+end
+
+begin
+    prog = mythtv
+    button = Menu
+    config = M
+end
+
+# Below are keys used with the Hauppauge Grey remote
+
+begin
+   prog = mythtv
+# This is the Red key
+# We'll use it for "Delete"
+   button = Red
+   config = D
+end
+
+begin
+   prog = mythtv
+# This is the Green key
+# We'll use it for "Information"
+   button = Green
+   config = I
+end
+
+# Note the "repeat = " strings in the volume and channel.
+# This means that if you hold down the key, every nth instance will be
+# passed.  This depends on your system, so you may want to increase or
+# decrease this and see what happens.  repeat = 1 is probably too
+# fast.
+
+begin
+  prog = mythtv
+# This is the Yellow key
+# Use it as a volume key
+  button = Yellow
+  repeat = 3
+  config = F10
+end
+
+begin
+  prog = mythtv
+# This is the Blue key
+# Use it as a volume key
+  button = Blue
+  repeat = 3
+  config = F11
+end
+
+begin
+    prog = mythtv
+    button = Ch+
+# This is the "up" on the central diamond
+    repeat = 3
+    config = Up
+end
+
+begin
+    prog = mythtv
+    button = Ch-
+# This is the "down" on the central diamond
+    repeat = 3
+    config = Down
+end
+
+begin
+    prog = mythtv
+    button = Vol-
+# This is the "left" on the central diamond
+    repeat = 3
+    config = Left
+end
+
+begin
+    prog = mythtv
+    button = Vol+
+# This is the "right" on the central diamond
+    repeat = 3
+    config = Right
+end
+
+begin
+    prog = mythtv
+# Middle button on the diamond
+    button = Ok
+    config = Return
+end
+
+begin
+    prog = mythtv
+    button = Mute
+    config = F9
+end
+
+begin
+   prog = mythtv
+# Change focus for PiP (to change channel in the other window)
+   button = Blank
+   config = B
+end
+
+begin
+   prog = mythtv
+# Toggle PiP on/off
+   button = Full
+   config = V
+end
+
+begin
+    prog = mythtv
+    button = Rewind
+    config = Left
+end
+
+begin
+    prog = mythtv
+    button = Play
+    config = P
+end
+
+begin
+    prog = mythtv
+    button = Forward
+    config = Right
+end
+
+begin
+  prog = mythtv
+  button = Record
+  config = R
+end
+
+begin
+   prog = mythtv
+# Teletext
+   button = Stop
+   config = T
+end
+
+begin
+    prog = mythtv
+    button = Pause
+    config = P
+end
+
+begin
+   prog = mythtv
+   button = Replay
+# Use for backwards commercial skip
+    config = Q
+end
+
+begin
+   prog = mythtv
+   button = Skip
+# Use for forward commercial skip
+    config = Z
+end
+
+#MPlayer
+begin
+   prog = mplayer
+   button = Power
+   config = quit
+end
+
+begin
+   prog = mplayer
+   button = Menu
+   config = osd
+end
+
+begin
+   prog = mplayer
+   button = Rewind
+   config = seek -10
+   repeat = 1
+end
+
+begin
+   prog = mplayer
+   button = Forward
+   config = seek +10
+   repeat = 1
+end
+
+begin
+   prog = mplayer
+   button = Replay
+   config = seek -60
+   repeat = 1
+end
+
+begin
+   prog = mplayer
+   button = Skip
+   config = seek +60
+   repeat = 1
+end
+
+begin
+    prog = mplayer
+    button = Pause
+    config = pause
+end
+
+begin
+    prog = mplayer
+    button = Play
+    config = pause
+end
+
+begin
+   prog = mplayer
+   button = Back/Exit
+   config = quit
+end
+
+begin
+   prog = mplayer
+   button = Vol+
+   config = volume +1
+   repeat = 1
+end
+
+begin
+   prog = mplayer
+   button = Vol-
+   config = volume -1
+   repeat = 1
+end
+
+begin
+   prog = mplayer
+   button = Mute
+   config = mute
+end
+##XINE
+
+ begin
+ prog = xine
+ button = Play
+ repeat = 3
+ config = Play
+ end
+
+ begin
+ prog = xine
+ button = Stop
+ repeat = 3
+ config = Stop
+ end
+
+ begin
+ prog = xine
+ button = Back/Exit
+ config = Quit
+ end
+
+ begin
+ prog = xine
+ button = Pause
+ repeat = 3
+ config = Pause
+ end
+
+ begin
+ prog = xine
+ button = Ch+
+ repeat = 4
+ config = EventUp
+ end
+
+ begin
+ prog = xine
+ button = Ch-
+ repeat = 4
+ config = EventDown
+ end
+
+ begin
+ prog = xine
+ button = Vol-
+ repeat = 4
+ config = EventLeft
+ end
+
+ begin
+ prog = xine
+ button = Vol+
+ repeat = 4
+ config = EventRight
+ end
+
+ begin
+ prog = xine
+ button = Ok
+ repeat = 0
+ config = EventSelect
+ end
+
+ begin
+ prog = xine
+ button = Menu
+ repeat = 0
+ config = Menu
+ end
+
+ #vol down
+ begin
+ prog = xine
+ button = Yellow
+ repeat = 1
+ config = Volume-
+ end
+
+ #vol up
+ begin
+ prog = xine
+ button = Red
+ repeat = 1
+ config = Volume+
+ end
+
+ begin
+ prog = xine
+ button = Forward
+ repeat = 2
+ config = SeekRelative+30
+ end
+
+ begin
+ prog = xine
+ button = Rewind
+ repeat = 2
+ config = SeekRelative-30
+ end
+
+ #ch up
+ begin
+ prog = xine
+ button = Green
+ repeat = 1
+ config = SeekRelative+60
+ end
+
+ #ch down
+ begin
+ prog = xine
+ button = Blue
+ repeat = 1
+ config = SeekRelative-60
+ end
+
+ #sleep
+ begin
+ prog = xine
+ button = Go
+ repeat = 1
+ config = ZoomIn
+ end
+
+ #display
+ begin
+ prog = xine
+ button = Skip
+ repeat = 1
+ config = ZoomOut
+ end
+
+ #skip chapter forward
+ begin
+ prog = xine
+ button = Skip
+ repeat = 1
+ config = EventNext
+ end
+
+ #skip chapter backward
+ begin
+ prog = xine
+ button = Replay
+ repeat = 1
+ config = EventPrior
+ end
+
+ begin
+ prog = lircnav
+ button = Vol-
+ config = page_down
+ end
+
+ begin
+ prog = lircnav
+ button = Vol+
+ config = page_up
+ end
+
+ begin
+ prog = lircnav
+ button = Ch+
+ config = up
+ end
+
+ begin
+ prog = lircnav
+ button = Ch-
+ config = down
+ end
+
+ begin
+ prog = lircnav
+ button = Ok
+ config = select
+ end
+
+ begin
+ prog = lircnav
+ button = Power
+ config = quit
+ end
+
diff --git a/abs/core-testing/LinHES-config/templates/remotes/hauppauge-grey/preview.jpg b/abs/core-testing/LinHES-config/templates/remotes/hauppauge-grey/preview.jpg
new file mode 100644
index 0000000..a40a1e8
--- /dev/null
+++ b/abs/core-testing/LinHES-config/templates/remotes/hauppauge-grey/preview.jpg
diff --git a/abs/core-testing/LinHES-config/templates/remotes/i2c.id b/abs/core-testing/LinHES-config/templates/remotes/i2c.id
new file mode 100644
index 0000000..50e89e9
--- /dev/null
+++ b/abs/core-testing/LinHES-config/templates/remotes/i2c.id
@@ -0,0 +1,5 @@
+0070:4000|Hauppauge|WinTV PVR 250|hauppauge-grey
+0070:4009|Hauppauge|WinTV PVR 250|hauppauge-grey
+0070:4801|Hauppauge|WinTV PVR 250|hauppauge-grey
+0070:4803|Hauppauge|WinTV PVR 250|hauppauge-grey
+0070:0003|Hauppauge|WinTV PVR 250|hauppauge-grey
\ No newline at end of file
diff --git a/abs/core-testing/LinHES-config/templates/samba/smb.conf.home b/abs/core-testing/LinHES-config/templates/samba/smb.conf.home
index b850a7d..c0f3136 100755
--- a/abs/core-testing/LinHES-config/templates/samba/smb.conf.home
+++ b/abs/core-testing/LinHES-config/templates/samba/smb.conf.home
@@ -1,5 +1,5 @@
 [home]
-   path = /data/home/mythtv/
+   path = /home/mythtv/
    public = yes
    only guest = yes
    writeable  = yes
diff --git a/abs/core-testing/LinHES-config/templates/samba/smb.conf.media b/abs/core-testing/LinHES-config/templates/samba/smb.conf.media
index 6a4ec91..3526933 100755
--- a/abs/core-testing/LinHES-config/templates/samba/smb.conf.media
+++ b/abs/core-testing/LinHES-config/templates/samba/smb.conf.media
@@ -1,5 +1,5 @@
 [media]
-   path = /data/media
+   path = /myth
    public = yes
    only guest = yes
    writeable  = yes