summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-05-18 14:36:54 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-05-20 13:44:28 +0000
commitf1e7a27e8425ae2485d812e4eba6b3ac26a8a9de (patch)
tree5bb273b6553c6580df1f6f1182e329644ee74691
parent4c2475fd36f3ab6eafadd0a5280f40d6ffcffc8d (diff)
downloadinfrastructure-f1e7a27e8425ae2485d812e4eba6b3ac26a8a9de.tar.gz
Add test Mason config for zuul-mason
-rw-r--r--mason.configure2
-rw-r--r--mason/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/mason.configure b/mason.configure
index e0be6b2e..ba13a510 100644
--- a/mason.configure
+++ b/mason.configure
@@ -50,7 +50,7 @@ mkdir -p "$ROOT/usr/lib/mason-setup"
cp mason/share/* "$ROOT/usr/share/mason-setup"
cp -r mason/ansible "$ROOT/usr/lib/mason-setup/"
-ln -s ../mason-setup.service "$ROOT"/etc/systemd/system/multi-user.target.wants/mason-setup.service
+ln -sf ../mason-setup.service "$ROOT"/etc/systemd/system/multi-user.target.wants/mason-setup.service
##########################################################################
# Check variables
diff --git a/mason/Makefile b/mason/Makefile
index daecb04c..0a3f4b2c 100644
--- a/mason/Makefile
+++ b/mason/Makefile
@@ -5,4 +5,4 @@
install:
- (cd .. && ./mason.configure /)
+ (cd .. && sh ./mason.configure /)