[gentoo-commits] proj/releng:master commit in: tools-hardened/, tools-systemd/

[gentoo-commits] proj/releng:master commit in: tools-hardened/, tools-systemd/

[Anthony G. Basile]

commit:     8d7e8ae3a31a83f6a033f359ec49561ae8cc47ef
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 10:00:05 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 10:00:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=8d7e8ae3

tools-systemd: isolate systemd scripts to their own directory

 tools-systemd/clean.sh                                    | 6 ++++++
 {tools-hardened => tools-systemd}/run-systemd.sh          | 6 ++----
 {tools-hardened => tools-systemd}/stage-all.conf.template | 0
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools-systemd/clean.sh b/tools-systemd/clean.sh
new file mode 100755
index 0000000..916c4eb
--- /dev/null
+++ b/tools-systemd/clean.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# This just removes the temporary conf err and log
+# files generated during a run
+
+rm -f *conf *err *log

diff --git a/tools-hardened/run-systemd.sh b/tools-systemd/run-systemd.sh
similarity index 89%
rename from tools-hardened/run-systemd.sh
rename to tools-systemd/run-systemd.sh
index 1160d42..abf901e 100755
--- a/tools-hardened/run-systemd.sh
+++ b/tools-systemd/run-systemd.sh
@@ -33,15 +33,13 @@ main() {
 
   catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
 
-#  for arch in amd64 i686; do
-  for arch in amd64; do
+  for arch in amd64 i686; do
     prepare_confs ${arch}
   done
 
   # The parallelization `( do_stages ... ) &` doesn't work here
   # if catalyst is using snapcache, bug #519656
-#  for arch in amd64 i686; do
-  for arch in amd64; do
+  for arch in amd64 i686; do
     do_stages ${arch}
     [[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log
   done

diff --git a/tools-hardened/stage-all.conf.template b/tools-systemd/stage-all.conf.template
similarity index 100%
rename from tools-hardened/stage-all.conf.template
rename to tools-systemd/stage-all.conf.template