summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2014-10-24 19:15:23 (GMT)
committerJames Meyer <james.meyer@operamail.com>2014-10-24 19:15:23 (GMT)
commitfb1559ad4d28296dcba806b40776976b857536ab (patch)
tree5114e71ce7e8c6513525f74d6f89d4a0e2480240 /abs
parent219a99493390ccc3689ff42dcfde858b5b68ca75 (diff)
downloadlinhes_pkgbuild-fb1559ad4d28296dcba806b40776976b857536ab.zip
linhes_pkgbuild-fb1559ad4d28296dcba806b40776976b857536ab.tar.gz
linhes_pkgbuild-fb1559ad4d28296dcba806b40776976b857536ab.tar.bz2
LinHES-config: copy over cnt interfaces during upgrades
Diffstat (limited to 'abs')
-rwxr-xr-xabs/core/LinHES-config/PKGBUILD4
-rw-r--r--abs/core/LinHES-config/mv_install.py13
2 files changed, 14 insertions, 3 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index d26a94f..1f7d048 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.2
-pkgrel=16
+pkgrel=17
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'
@@ -133,7 +133,7 @@ package() {
install -o root -g root -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf
}
-md5sums=('af15ebdfbbc3442626a807569a0db2a4'
+md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff'
'3f6855b7bb860a44f96a972c2e80f497'
'f6e9dd7bc6cf0aaa3bd203dab4cb79b9'
'2596460462cf6c889cf8f95485537b20'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 9556a0e..7dfbddb 100644
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -924,6 +924,10 @@ def copy_it(install_type):
cp_and_log("/etc/dhcpcd.duid", data_config.MOUNTPOINT+"/etc/dhcpcd.duid")
cp_and_log("/var/lib/dhcpcd/*.lease", data_config.MOUNTPOINT+"/var/lib/dhcpcd/")
+
+
+
+
# General fixup
cmd = "chmod 777 %s/tmp" %(data_config.MOUNTPOINT)
runcmd(cmd)
@@ -1828,7 +1832,7 @@ def find_upgrade():
cp_and_log(data_config.MOUNTPOINT+"/var/lib/oss/", "/tmp/oss")
cp_and_log("/tmp/etc/mdadm.conf", "/etc/mdadm.conf")
cp_and_log("/tmp/etc/dhcpcd.duid", "/etc/dhcpcd.duid")
-
+
else:
logging.info("Could not find systemconfig file %s", srcfile)
cp_and_log(data_config.MOUNTPOINT+"/etc/", "/tmp/etc/")
@@ -1975,6 +1979,13 @@ def upgrade(hostoptions):
cp_and_log2(srcfile, destfile, '*.pkl')
+ #ctn interfaces
+ srcfile = "%s/etc.old/net/ifaces/" %(data_config.MOUNTPOINT)
+ destfile = "%s/etc/net/ifaces/" %(data_config.MOUNTPOINT)
+ cp_and_log2(srcfile, destfile, 'ctn*')
+
+
+
mdfile = mdadm_find("/tmp")
cp_and_log("/tmp"+mdfile, data_config.MOUNTPOINT+"/etc")