Merge branch 'testing'

9 files changed, 205 insertions, 62 deletions

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 449f456..6a8cba3 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,13 +1,12 @@
 pkgname=LinHES-config
 pkgver=8.0
-pkgrel=2
+pkgrel=10
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab'  'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
 	 'sg3_utils' 'nmbscan' 'system-templates' 'rsync' 'python-parted'
-	 'python-pexpect' 'python-netifaces'
+	 'python-pexpect' 'python-netifaces' 'xcursor-vanilla-dmz-aa'
 	 'python-iplib' 'mythinstall>=2-10' 'sudo' 'setserial' 'udevil')
-#LinHES-timezone
 arch=('i686' 'x86_64')
 
 source=(mv_install.py 09_mythvantge_runit_grub
@@ -59,15 +58,15 @@ source=(mv_install.py 09_mythvantge_runit_grub
 backup=(etc/mythvantage.cfg)
 install=config.install
 
-build() {
-    mkdir -p $startdir/pkg/etc
-    mkdir -p $startdir/pkg/usr/share/mythtv/themes/default
-    install -D -m0755 09_mythvantge_runit_grub $startdir/pkg/etc/grub.d/09_mythvantge_runit_grub
+package() {
+    mkdir -p $pkgdir/etc
+    mkdir -p $pkgdir/usr/share/mythtv/themes/default
+    install -D -m0755 09_mythvantge_runit_grub $pkgdir/etc/grub.d/09_mythvantge_runit_grub
 
 
-    MVDIR=$startdir/pkg/usr/MythVantage
-    mkdir  $startdir/pkg/etc/profile.d
-    install -m 0755 MythVantage.sh  $startdir/pkg/etc/profile.d/MythVantage.sh
+    MVDIR=$pkgdir/usr/MythVantage
+    mkdir $pkgdir/etc/profile.d
+    install -m 0755 MythVantage.sh  $pkgdir/etc/profile.d/MythVantage.sh
     mkdir -p $MVDIR/bin
     mkdir -p $MVDIR/etc
 
@@ -110,30 +109,31 @@ build() {
     install -m 0755 plymouth_config.py $MVDIR/bin/
     install -m 0755 discover_infinitv.py $MVDIR/bin/
     install -m 0755 backend_control.sh $MVDIR/bin/
-    install -m 0755 mythvantage.cfg $startdir/pkg/etc/
+    install -m 0755 mythvantage.cfg $pkgdir/etc/
 
     #README file displayed on install
     install -m 0755 README $MVDIR/README
 
-    mkdir -p $startdir/pkg/usr/bin
-    install -m 0755 file_time_offset.py $startdir/pkg/usr/bin/file_time_offset.py
+    mkdir -p $pkgdir/usr/bin
+    install -m 0755 file_time_offset.py $pkgdir/usr/bin/file_time_offset.py
     #Copy in the branding stuff
-    install -m 0755 LinHES-release $startdir/pkg/etc/LinHES-release
+    install -m 0755 LinHES-release $pkgdir/etc/LinHES-release
 
     #sudo rules
-    mkdir -p $startdir/pkg/etc/sudoers.d/
-    chmod 750 $startdir/pkg/etc/sudoers.d/
-    chown -R root:root $startdir/pkg/etc/sudoers.d
-    install -o root -g root -m 0750 config-sudo.rules $startdir/pkg/etc/sudoers.d/config_sudo
+    mkdir -p $pkgdir/etc/sudoers.d/
+    chmod 750 $pkgdir/etc/sudoers.d/
+    chown -R root:root $pkgdir/etc/sudoers.d
+    install -o root -g root -m 0750 config-sudo.rules $pkgdir/etc/sudoers.d/config_sudo
 
     #sysctrl conf
-    install -o root -g root  -D -m 0755 hdhr.conf $startdir/pkg/etc/sysctl.d/hdhr.conf
+    install -o root -g root  -D -m 0755 hdhr.conf $pkgdir/etc/sysctl.d/hdhr.conf
 
     #modules blacklist files
-    install -o root -g root  -D -m 0755 blacklist_pcspkr.conf $startdir/pkg/etc/modprobe.d/blacklist_pcspkr.conf
-    install -o root -g root  -D -m 0755 blacklist_nouveau.conf $startdir/pkg/etc/modprobe.d/blacklist_nouveau.conf
+    install -o root -g root  -D -m 0755 blacklist_pcspkr.conf $pkgdir/etc/modprobe.d/blacklist_pcspkr.conf
+    install -o root -g root  -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf
 }
-md5sums=('7cdc9bc678ab02a2d30444e20a3c71eb'
+
+md5sums=('c832059cd635359d39a2ac3166ff463c'
          '3f6855b7bb860a44f96a972c2e80f497'
          'aaeb581275433649ff74e05da5e61a78'
          '2596460462cf6c889cf8f95485537b20'
@@ -155,11 +155,11 @@ md5sums=('7cdc9bc678ab02a2d30444e20a3c71eb'
          '5e865cc04fe5de8a39d9c1e377fc4ebe'
          'd3490e93f313bbbcbc6c3693c56b9c17'
          '3d1e4a119f38cff0498bf8a67e94e4b3'
-         '71fd2d0d448fc2fcd15415a1beed7109'
+         '2506860a416e1988934225d80d501c2c'
          'c0549457750c4f8e8038d904a0f3012a'
-         '3d1e3c7315881a109fb089a540d2262c'
+         '075fe16ef92621ce31f41df5c5577daf'
          'b845de3e05c1734cce4b9ac5e8f1baaf'
-         'f9b38f3d8e6d25b7c67b4c33cdee58db'
+         '31ad5416bf2ab1909338a16035941127'
          '8b7dce4a3a0a281fa6656aa8781a648e'
          'f7f2dc11d1ba454cd25eeaa133104b62'
          '824e49d9b01fed295c704ab68908b464'
@@ -167,11 +167,11 @@ md5sums=('7cdc9bc678ab02a2d30444e20a3c71eb'
          '3eec99951c01d1a1abf7ecfeb33f922b'
          '087a0ef743bc8af915503f8773536ce4'
          '183a11aa06d60065106472ed9f72cc4a'
-         'b4900090d841d3e390cb840cf16afd85'
+         '80685e047993b00161be29e3580f3a40'
          '299c24c0820fc9c483c820db2595e3cb'
          'cf51cb22e23218ae7e9b55cac1ba3a7f'
-         'e4b61402858058f7575b776d62d5ee89'
-         '1a17256202d851f37c54f2836c244b5d'
+         '781f161a79c3188a31c8615b8258b241'
+         '540a5b7f63a83ad53d6924c637bfd1c7'
          '2596460462cf6c889cf8f95485537b20'
          'dc3c5270691a62600475705f4cb78b56'
          '4804aa93aaad3dfcfff08cd9ffd68836'
diff --git a/abs/core/LinHES-config/README b/abs/core/LinHES-config/README
index e9c7b03..d7beb9f 100644
--- a/abs/core/LinHES-config/README
+++ b/abs/core/LinHES-config/README
@@ -4,8 +4,9 @@ Installation Guide:
 http://linhes.org/install
 
 Support for LinHES:
-http://linhes.org
-irc.freenode.net #linhes
+Wiki - http://linhes.org
+Forums - http://forum.linhes.org
+IRC - irc.freenode.net #linhes
  
 Report bugs at:
-http://linhes.org/bugs
+http://linhes.org/
diff --git a/abs/core/LinHES-config/config.install b/abs/core/LinHES-config/config.install
index 2da71ff..c9171a6 100644
--- a/abs/core/LinHES-config/config.install
+++ b/abs/core/LinHES-config/config.install
@@ -38,6 +38,8 @@ post_upgrade() {
        echo "config.xml not found, generating a new one"
        /usr/MythVantage/bin/systemconfig.py -m hostype
     fi
+
+    /usr/MythVantage/bin/systemconfig.py -m locale    
 }
 
 # arg 1:  the old package version
diff --git a/abs/core/LinHES-config/mv_common.py b/abs/core/LinHES-config/mv_common.py
index 432c270..ff2ee9f 100755
--- a/abs/core/LinHES-config/mv_common.py
+++ b/abs/core/LinHES-config/mv_common.py
@@ -229,7 +229,7 @@ def pacinstall(pkg):
 
     elif pkg == "xymonclient":
         if os.path.exists('/home/xymon/client'):
-            cmd='''pacman --noconfirm --dbonly -Sddf xymonclient'''
+            cmd='''pacman --noconfirm --dbonly -Sdd --force xymonclient'''
             runcmd(cmd)
 
     if  not pkg_blacklist_check(pkg):
@@ -237,7 +237,7 @@ def pacinstall(pkg):
             logging.info("    %s is already installed, will not install",pkg)
         else:
             logging.info("    Installing %s",pkg)
-            cmd ='''pacman --noconfirm -Sf %s ''' %pkg
+            cmd ='''pacman --noconfirm -S --force %s ''' %pkg
             runcmd(cmd)
     else:
         logging.info("    %s is blacklisted, will not install",pkg)
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 1128571..57b784b 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -259,7 +259,7 @@ def blank_table(diskdevice):
     cmd = "parted %s --script -- mklabel msdos" %diskdevice
     runcmd(cmd)
 
-    logging.debug("parition table after:")
+    logging.debug("partition table after:")
     cmd = "fdisk -l %s" %diskdevice
     runcmd(cmd)
 
@@ -392,35 +392,128 @@ def set_active_parition(diskdevice):
             logging.info("    Depending on your system this may not matter")
 
 
+#def partition_disk():
+    #global hostoptions
+    #logging.info("Partitioning")
+    #logging.debug("____start of partition_disk____")
+    #rootdisk = hostoptions["rootdisk"]
+    #datadisk = hostoptions["datadisk"]
+    #label = "root"
+    #partitions_removeall("/dev/"+rootdisk, label)
+    #label = "data"
+    #partitions_removeall("/dev/"+datadisk, label)
+    #hostoptions["rootpartition"] = create_partitions("/dev/"+rootdisk, hostoptions["rootsize"], "NORMAL", 0)
+    #set_active_parition("/dev/"+rootdisk)
+
+    #hostoptions["swappartition"] = create_partitions("/dev/"+rootdisk, hostoptions["swapsize"], "SWAP", 1)
+
+    ##create extended partition
+    #hostoptions["extended_partition"] = create_partitions("/dev/"+rootdisk, "all", "EXTENDED", 1)
+
+    ##create the logical in the extended
+    #hostoptions["home_partition"] = create_partitions("/dev/"+rootdisk, hostoptions["homesize"], "LOGICAL", 1)
+    #hostoptions["sql_partition"] = create_partitions("/dev/"+rootdisk, hostoptions["sqlsize"], "LOGICAL", 1)
+
+    #if datadisk != rootdisk:
+        #hostoptions["datapartition"] = create_partitions("/dev/"+datadisk, hostoptions["datasize"], "NORMAL", 0)
+    #else:
+        #hostoptions["datapartition"] = create_partitions("/dev/"+datadisk, hostoptions["datasize"], "LOGICAL", 1)
+
+    #logging.debug("sleeping for 5 seconds")
+    #time.sleep(5)
+
+
+#parted /dev/sda -a optimal --script  mklabel gpt
+#parted /dev/sda -a optimal --script unit MB  -- mkpart primary  1 500
+#parted /dev/sda -a optimal --script unit MB  -- mkpart swap  501 600
+#parted /dev/sda -a optimal --script unit MB  -- mkpart primary  601 601
+#parted /dev/sda -a optimal --script unit MB  -- mkpart primary  601 601
+
+#parted /dev/sda -a optimal --script unit MB  -- mkpart primary  604 700
+#parted /dev/sda -a optimal --script unit MB  -- mkpart primary  700 800
+#parted /dev/sda -a optimal --script unit MB  -- mkpart primary  800 -1
+
+def create_partitions_gpt(diskdevice, start,size,partition_type):
+    logging.debug("_____Create partitions gpt ______")
+    if size == "NO" or size == "no":
+        logging.info("Size is 0,  skipping")
+        last_sector  = start
+    elif size == "all" or size == "ALL":
+        logging.info("Size is all, using rest of disk")
+        last_sector = "-1"
+    else:
+        last_sector = start + int(size)
+
+    cmd = "parted %s  -a optimal --script unit MB  -- mkpart primary  %s %s" %(diskdevice, start, last_sector)
+    runcmd(cmd)
+    
+    newstart = last_sector
+    #print newstart
+    return newstart
+    
+    
+    
+
+
+
 def partition_disk():
     global hostoptions
     logging.info("Partitioning")
     logging.debug("____start of partition_disk____")
-    rootdisk = hostoptions["rootdisk"]
-    datadisk = hostoptions["datadisk"]
+    rootdisk = "/dev/%s" %(hostoptions["rootdisk"])
+    datadisk = "/dev/%s" %(hostoptions["datadisk"])
     label = "root"
-    partitions_removeall("/dev/"+rootdisk, label)
+    partitions_removeall(rootdisk, label)
     label = "data"
-    partitions_removeall("/dev/"+datadisk, label)
-    hostoptions["rootpartition"] = create_partitions("/dev/"+rootdisk, hostoptions["rootsize"], "NORMAL", 0)
-    set_active_parition("/dev/"+rootdisk)
+    partitions_removeall(datadisk, label)
+    #create gpt table
+    cmd = "parted %s -a optimal --script  mklabel gpt" %rootdisk
+    runcmd(cmd)
+    cmd = "parted %s -a optimal --script  mklabel gpt" %datadisk
+    runcmd(cmd)
+    
+    start_sector = 1
+    start_sector = create_partitions_gpt(rootdisk, start_sector, hostoptions["rootsize"], "primary")
+    start_sector = create_partitions_gpt(rootdisk, start_sector, hostoptions["swapsize"], "primary")
+    hostoptions["rootpartition"] = hostoptions["rootdisk"]+str(1)  
+    hostoptions["swappartition"]  =  hostoptions["rootdisk"] + str(2)
+    hostoptions["home_partition"] = hostoptions["rootdisk"]+str(5)
+    hostoptions["sql_partition"] = hostoptions["rootdisk"]+str(6)
+    hostoptions["datapartition"] = hostoptions["datadisk"]+str(7)
+        
+    
+    #create 1 blank to match up with extended/logical layout from 8.0
+    start_sector = create_partitions_gpt(rootdisk, start_sector, "NO", "primary")
+
+    #create gtp boot
+    start_sector = start_sector + 1
+    start_sector = create_partitions_gpt(rootdisk, start_sector, 2 , "primary")
+    cmd = "parted %s set 4 bios_grub on" %rootdisk
+    runcmd(cmd)
+    
+    #create home_partition
+    start_sector = start_sector + 1
+    start_sector = create_partitions_gpt(rootdisk, start_sector, hostoptions["homesize"], "primary")
+    
+    ##create mysql
+    start_sector = start_sector + 1
+    start_sector  = create_partitions_gpt(rootdisk, start_sector, hostoptions["sqlsize"], "primary")
+    
+    start_sector = start_sector + 1
+    #create data
+    if datadisk != rootdisk:
+        create_partitions_gpt(datadisk, 1, hostoptions["datasize"], "primary")
+    else:
+        create_partitions_gpt(datadisk, start_sector, hostoptions["datasize"], "primary")
+    
+    logging.debug("sleeping for 5 seconds")
+    time.sleep(5)
+
 
-    hostoptions["swappartition"] = create_partitions("/dev/"+rootdisk, hostoptions["swapsize"], "SWAP", 1)
 
-    #create extended partition
-    hostoptions["extended_partition"] = create_partitions("/dev/"+rootdisk, "all", "EXTENDED", 1)
 
-    #create the logical in the extended
-    hostoptions["home_partition"] = create_partitions("/dev/"+rootdisk, hostoptions["homesize"], "LOGICAL", 1)
-    hostoptions["sql_partition"] = create_partitions("/dev/"+rootdisk, hostoptions["sqlsize"], "LOGICAL", 1)
 
-    if datadisk != rootdisk:
-        hostoptions["datapartition"] = create_partitions("/dev/"+datadisk, hostoptions["datasize"], "NORMAL", 0)
-    else:
-        hostoptions["datapartition"] = create_partitions("/dev/"+datadisk, hostoptions["datasize"], "LOGICAL", 1)
 
-    logging.debug("sleeping for 5 seconds")
-    time.sleep(5)
 
 
 def fscmd(fstype):
@@ -1466,6 +1559,9 @@ def restore_default_settings():
     cmd = "%s/bin/myth_settings_wrapper.sh -c save -t syssettings -h %s -d localhost" %(MVROOT, data_config.MVHOSTNAME)
     runcmd(cmd)
     SE = os.environ["TEMPLATES"]+"/settings/syssettings/"
+    #this is needed because the settings dir is no longer part of the templates pkg
+    cmd="mkdir -p %s" %(data_config.MOUNTPOINT+SE)
+    runcmd(cmd)
     cp_and_log(SE, data_config.MOUNTPOINT+SE)
     cp_and_log("/etc/mtab", data_config.MOUNTPOINT+"/etc/mtab")
     copy_updates()
@@ -1530,7 +1626,7 @@ def full_install(hostoptions):
         partition_disk()
     else:
         logging.debug("     Debug mode,  skipping partitioning step")
-
+    #sys.exit(0)
 #   Format disk
     statusmsg = "Preparing  %s"  %( hostoptions["rootdisk"])
     update_status(statusmsg)
@@ -2163,9 +2259,6 @@ for line in config_file:
 
 
 
-
-
-
 if __name__ == "__main__":
     config_file = "mv_config"
     data_config = __import__(config_file,  globals(),  locals(),  [])
diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py
index d77f64f..f481fa4 100755
--- a/abs/core/LinHES-config/mv_ir.py
+++ b/abs/core/LinHES-config/mv_ir.py
@@ -136,6 +136,48 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket):
             cmd = "cp %s /etc/remote.run" %filename
             mv_common.runcmd(cmd)
 
+        #if remote has a special xbmc file, use it.
+        xbmcfile= remote_path + "/xbmc.xml"
+        userxmbcfile = mythhome+"/.xbmc/userdata/Lircmap.xml"
+        
+        if os.path.exists(xbmcfile):
+            logging.debug("     XBMC lirc file present")
+            logging.info("    Setting up lirc for xbmc")
+            if not os.path.exists(mythhome+"/.xbmc/userdata"):
+                logging.debug("    Creating %s/.xbmc",mythhome)
+                try:
+                    os.mkdir(mythhome+"/.xbmc")
+                except:
+                    logging.debug("   Couldn't create .xbmc/ ")
+                try:
+                    os.mkdir(mythhome+"/.xbmc/userdata/")
+                except:
+                    logging.debug("   Couldn't create .xbmc/userdata ")
+                    
+                try:
+                    cmd = ''' chown -R mythtv %s/.xbmc''' %mythhome
+                    mv_common.runcmd(cmd)
+                    cmd = ''' chgrp -R mythtv %s/.xbmc/userdata''' %mythhome
+                    mv_common.runcmd(cmd)
+                except:
+                    logging.debug("   Couldn't change permissions for .xbmc")
+                    pass    
+            try:
+                    cmd = ''' rm -f %s''' %(userxmbcfile)
+                    mv_common.runcmd(cmd)
+                    logging.debug("    Creating symlink for xmbc lircrc")
+                    os.symlink(xbmcfile, mythhome+"/.xbmc/userdata/Lircmap.xml")
+            except:
+                pass
+        else:
+            logging.debug("    XBMC lirc file %s not present" %xbmcfile)
+        
+            
+        
+        
+        
+        
+
         #remote has it's own modprobe.d/conf filename
         cmd = "rm  -f /etc/modprobe.d/mv_ir.conf"
         mv_common.runcmd(cmd)
diff --git a/abs/core/LinHES-config/mv_locale.py b/abs/core/LinHES-config/mv_locale.py
index 973be31..172e074 100644
--- a/abs/core/LinHES-config/mv_locale.py
+++ b/abs/core/LinHES-config/mv_locale.py
@@ -57,7 +57,7 @@ def genlocale(locale_list):
 
 def update_locale_conf(locale):
     logging.info("    Updating /etc/locale.conf")
-    line='''LOCALE="%s"''' %locale
+    line='''LANG="%s"''' %locale
     try:
         f = open('/etc/locale.conf',"w")
         f.write(line)
diff --git a/abs/core/LinHES-config/mv_supplemental.py b/abs/core/LinHES-config/mv_supplemental.py
index 2b8bd2f..50a6c1a 100755
--- a/abs/core/LinHES-config/mv_supplemental.py
+++ b/abs/core/LinHES-config/mv_supplemental.py
@@ -24,7 +24,12 @@ def windowmanager(systemconfig):
     else:
         style = ""
 
-    mv_common.pacinstall("alt_wm")
+    if windowmanager != "fluxbox":
+        mv_common.pacinstall("e16_theme_settings")
+        mv_common.pacinstall("wmaker_settings")
+    else:
+        mv_common.pacinstall("alt_wm")
+
     cmd = '''/usr/LH/bin/set_windowmanager.sh %s %s ''' %(windowmanager,style)
     print cmd
     mv_common.runcmd(cmd)
@@ -41,9 +46,9 @@ def supplemental(systemconfig,this_is_install = False):
         logging.info("     Installing supplemental system\n")
         if this_is_install == True:
             if os.path.exists('/home/xymon/server'):
-                cmd='''pacman --noconfirm --dbonly -Sddf xymonserver'''
+                cmd='''pacman --noconfirm --dbonly -Sdd --force xymonserver'''
                 mv_common.runcmd(cmd)
 
         cmd='''/usr/LH/bin/install_supplemental_service.sh'''
         mv_common.runcmd(cmd)
-    logging.info("__End of supplemental\n")
\ No newline at end of file
+    logging.info("__End of supplemental\n")
diff --git a/abs/core/LinHES-config/systemconfig.py b/abs/core/LinHES-config/systemconfig.py
index f7e3f5d..07b2820 100755
--- a/abs/core/LinHES-config/systemconfig.py
+++ b/abs/core/LinHES-config/systemconfig.py
@@ -40,8 +40,8 @@ def setup_x(systemconfig):
         logging.info("____Skipping of Xorg, config disabled____")
     else:
 	if not os.path.exists('/usr/share/icons/default'):
-		if os.path.exists('/usr/share/icons/whiteglass'):
- 	            os.symlink('/usr/share/icons/whiteglass','/usr/share/icons/default');
+		if os.path.exists('/usr/share/icons/Vanilla-DMZ-AA'):
+ 	            os.symlink('/usr/share/icons/Vanilla-DMZ-AA','/usr/share/icons/default');
         if systemconfig.get("UseXLargeMouse") == "1" :
             cmd = "echo Xcursor.size: 48 > %s/.Xdefaults" %data_config.MYTHHOME
         else: