summaryrefslogtreecommitdiffstats
path: root/abs/core
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2013-01-12 02:39:25 (GMT)
committerJames Meyer <james.meyer@operamail.com>2013-01-12 02:39:25 (GMT)
commit767d6c0306d38a5c3370711a7c0d2185b1b27f75 (patch)
tree1b7411f09895e10a7fb2205245420ab10711b5e6 /abs/core
parent63ebdd273929a867a2aa9dd40375bdf8a3036a81 (diff)
downloadlinhes_pkgbuild-767d6c0306d38a5c3370711a7c0d2185b1b27f75.zip
linhes_pkgbuild-767d6c0306d38a5c3370711a7c0d2185b1b27f75.tar.gz
linhes_pkgbuild-767d6c0306d38a5c3370711a7c0d2185b1b27f75.tar.bz2
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
Diffstat (limited to 'abs/core')
-rwxr-xr-xabs/core/LinHES-config/PKGBUILD4
-rwxr-xr-xabs/core/LinHES-config/mv_install.py5
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()