summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Harris <nharris@eoimaging.com>2009-08-12 18:52:33 (GMT)
committerNathan Harris <nharris@eoimaging.com>2009-08-12 18:52:33 (GMT)
commit07d18deb0e32e6b635e61b709e5890ae044acfed (patch)
tree28679574c7e9e9e6c69f717f67aab831cb16c8f9
parentc42d21d10ab8fe1f025f56cae33bccdec343e1b0 (diff)
downloadlinhes_pkgbuild-07d18deb0e32e6b635e61b709e5890ae044acfed.zip
linhes_pkgbuild-07d18deb0e32e6b635e61b709e5890ae044acfed.tar.gz
linhes_pkgbuild-07d18deb0e32e6b635e61b709e5890ae044acfed.tar.bz2
LinHES-config: fixes from jams
-rw-r--r--abs/core-testing/LinHES-config/PKGBUILD2
-rwxr-xr-xabs/core-testing/LinHES-config/mv_install.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index e8b26c3..19e3174 100644
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.0
-pkgrel=78
+pkgrel=79
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
pkgdesc="Install and configure your system"
depends=(bc libstatgrab mysql-python expect curl dnsutils parted
diff --git a/abs/core-testing/LinHES-config/mv_install.py b/abs/core-testing/LinHES-config/mv_install.py
index bace1a5..5330975 100755
--- a/abs/core-testing/LinHES-config/mv_install.py
+++ b/abs/core-testing/LinHES-config/mv_install.py
@@ -701,7 +701,7 @@ def fix_permissions():
SE = os.environ["TEMPLATES"]+"/settings/syssettings"
cmd = " chmod -R 755 %s" %(data_config.MOUNTPOINT+SE)
runcmd(cmd)
- cmd = " chmod 755 %s" %(data_config.MOUNTPOINT+"/etc/systemconfig")
+ cmd = " chmod 775 %s" %(data_config.MOUNTPOINT+"/etc/systemconfig")
runcmd(cmd)
cmd = " chmod 755 %s" %(data_config.MOUNTPOINT+"/root")
runcmd(cmd)
@@ -1071,7 +1071,7 @@ def find_upgrade():
srcfile = data_config.MOUNTPOINT+"/etc/systemconfig"
logging.info("Searching for systemconfig file %s", srcfile)
if os.path.exists(srcfile):
- logging.info("Found systemconfig file %fs", srcfile)
+ logging.info("Found systemconfig file %s", srcfile)
TEMPLATES = os.environ["TEMPLATES"]+"/settings/syssettings"
cp_and_log2(data_config.MOUNTPOINT+TEMPLATES, data_config.TEMP_TEMPLATES, '')
sane_settings("/tmp/templates/settings/syssettings/settings.txt")