From 767d6c0306d38a5c3370711a7c0d2185b1b27f75 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Fri, 11 Jan 2013 20:39:25 -0600
Subject: LinHES-config:  mv_install,  erase both msdos and gpt labels for new
 installs.   If a gpt label is present the install will fail due to the usage
 of extended partitions

refs #889
---
 abs/core/LinHES-config/PKGBUILD      | 4 ++--
 abs/core/LinHES-config/mv_install.py | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index f09662c..f4ab4d0 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.3
-pkgrel=206
+pkgrel=207
 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'
@@ -131,7 +131,7 @@ build() {
     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
 }
-md5sums=('26e20dba8d1bea96a07131ef945fd2f7'
+md5sums=('32fc2b52809231d75a72492b91eeed74'
          '3f6855b7bb860a44f96a972c2e80f497'
          'aaeb581275433649ff74e05da5e61a78'
          '2596460462cf6c889cf8f95485537b20'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index e78c548..812293d 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -256,6 +256,9 @@ def blank_table(diskdevice):
     cmd = "echo w |fdisk %s" %diskdevice
     runcmd(cmd)
 
+    cmd = "parted %s --script -- mklabel msdos" %diskdevice
+    runcmd(cmd)
+
     logging.debug("parition table after:")
     cmd = "fdisk -l %s" %diskdevice
     runcmd(cmd)
@@ -263,6 +266,8 @@ def blank_table(diskdevice):
 def partitions_removeall(diskdevice, label):
     logging.info("  Removing all partitions for %s  %s", label, diskdevice)
     try:
+        cmd = "parted %s --script -- mklabel msdos" %diskdevice
+        runcmd(cmd)
         device = parted.getDevice(diskdevice)
         partdisk = parted.Disk(device)
         partdisk.deleteAllPartitions()
-- 
cgit v0.12