diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2016-03-03 21:38:42 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2016-03-03 21:38:42 -0500 |
| commit | ed422ec6fbe0d9dc8b4af8463541d0a18c820ec9 (patch) | |
| tree | e13701ea48beb0d96b52924ce3db9ed7c4072ff7 | |
| parent | tools-hardened: add test scripts for systemd stages (diff) | |
| download | releng-ed422ec6.tar.gz releng-ed422ec6.tar.bz2 releng-ed422ec6.zip | |
tools-hardened: fix stage names in template
| -rwxr-xr-x[-rw-r--r--] | tools-hardened/run-systemd.sh | 5 | ||||
| -rw-r--r-- | tools-hardened/stage-all.conf.template | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools-hardened/run-systemd.sh b/tools-hardened/run-systemd.sh index 94c57d17..1160d429 100644..100755 --- a/tools-hardened/run-systemd.sh +++ b/tools-hardened/run-systemd.sh @@ -13,11 +13,12 @@ prepare_confs() { local pstage=stage${p} local parch="${arch}" - [[ "${arch}" == "i686" ]] && parch="x86" + [[ "${arch}" == "i686" ]] && parch="x86" cat stage-all.conf.template | \ sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \ - -e "s:STAGE:${cstage}:g" \ + -e "s:CSTAGE:${cstage}:g" \ + -e "s:PSTAGE:${pstage}:g" \ -e "s:SARCH:${arch}:g" \ -e "s:PARCH:${parch}:g" \ > stage${s}-${arch}-systemd.conf diff --git a/tools-hardened/stage-all.conf.template b/tools-hardened/stage-all.conf.template index 942ddc75..5e4cb39f 100644 --- a/tools-hardened/stage-all.conf.template +++ b/tools-hardened/stage-all.conf.template @@ -1,7 +1,7 @@ subarch: SARCH -target: STAGE +target: CSTAGE version_stamp: systemd rel_type: systemd/SARCH profile: default/linux/PARCH/13.0/systemd snapshot: current -source_subpath: systemd/SARCH/STAGE-SARCH-systemd +source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd |