diff options
| author | James Meyer <james.meyer@operamail.com> | 2013-06-01 00:40:17 (GMT) | 
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2013-06-01 00:40:17 (GMT) | 
| commit | d068c8d3408181d65f458563438b38560b71c9e8 (patch) | |
| tree | 01b79002211c4de472a483c3754488f33b3a1d6d | |
| parent | 22aff21a70f6788ac33d126795702fc5e257c862 (diff) | |
| download | linhes_pkgbuild-d068c8d3408181d65f458563438b38560b71c9e8.zip linhes_pkgbuild-d068c8d3408181d65f458563438b38560b71c9e8.tar.gz linhes_pkgbuild-d068c8d3408181d65f458563438b38560b71c9e8.tar.bz2  | |
LinHES-config: fix a nasty bug where some of the system settings didn't get transferred on install.
| -rwxr-xr-x | abs/core/LinHES-config/PKGBUILD | 4 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/mv_install.py | 3 | 
2 files changed, 5 insertions, 2 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 3b083a2..131efd9 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@  pkgname=LinHES-config  pkgver=8.0 -pkgrel=3 +pkgrel=4  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 @@ 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=('70d0e964788d1d7bc622c20d7d8d8f5c' +md5sums=('c832059cd635359d39a2ac3166ff463c'           '3f6855b7bb860a44f96a972c2e80f497'           'aaeb581275433649ff74e05da5e61a78'           '2596460462cf6c889cf8f95485537b20' diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py index 2712a60..57b784b 100755 --- a/abs/core/LinHES-config/mv_install.py +++ b/abs/core/LinHES-config/mv_install.py @@ -1559,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()  | 
