diff options
| author | Rob Austein <sra@hactrn.net> | 2013-01-08 20:03:01 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2013-01-08 20:03:01 +0000 |
| commit | 5bfaa95b9c6a076bbe16966bb77c4dd42ddc5039 (patch) | |
| tree | 6e39f420ae7e34b6292a7cc823cd116ea714f3b7 /rcynic | |
| parent | c224ba7a2f2e662ec3e6d7e22a62ee0cfb3c549f (diff) | |
Checkpoint
svn path=/branches/tk377/; revision=4959
Diffstat (limited to 'rcynic')
| -rw-r--r-- | rcynic/installation-scripts/freebsd/install.sh | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/rcynic/installation-scripts/freebsd/install.sh b/rcynic/installation-scripts/freebsd/install.sh index 105de21b..2bcf561a 100644 --- a/rcynic/installation-scripts/freebsd/install.sh +++ b/rcynic/installation-scripts/freebsd/install.sh @@ -51,10 +51,8 @@ if ! rcynic_jaildir="$jaildir" rcynic_user="$jailuser" rcynic_group="$jailgroup" exit 1 fi -if /bin/test -r "$jaildir/etc/rcynic.conf"; then - echo "You already have config file \"${jaildir}/etc/rcynic.conf\", so I will use it." -elif /usr/bin/install -m 444 -o root -g wheel -p ../sample-rcynic.conf "${jaildir}/etc/rcynic.conf"; then - echo "Installed minimal ${jaildir}/etc/rcynic.conf, adding SAMPLE trust anchors" +if /usr/bin/install -m 444 -o root -g wheel -p ../sample-rcynic.conf "${jaildir}/etc/rcynic.conf.sample"; then + echo "Installed minimal ${jaildir}/etc/rcynic.conf.sample, adding SAMPLE trust anchors" for i in ../../sample-trust-anchors/*.tal; do j="$jaildir/etc/trust-anchors/${i##*/}" /bin/test -r "$i" || continue @@ -64,10 +62,19 @@ elif /usr/bin/install -m 444 -o root -g wheel -p ../sample-rcynic.conf "${jaildi done j=1 for i in $jaildir/etc/trust-anchors/*.tal; do - echo >>"${jaildir}/etc/rcynic.conf" "trust-anchor-locator.$j = /etc/trust-anchors/${i##*/}" + echo >>"${jaildir}/etc/rcynic.conf.sample" "trust-anchor-locator.$j = /etc/trust-anchors/${i##*/}" j=$((j+1)) done else + echo "Installing minimal ${jaildir}/etc/rcynic.conf.sample failed" + exit 1 +fi + +if /bin/test -r "$jaildir/etc/rcynic.conf"; then + echo "You already have config file \"${jaildir}/etc/rcynic.conf\", so I will use it." +elif /bin/cp -p "$jaildir/etc/rcynic.conf.sample" "$jaildir/etc/rcynic.conf" + echo "Installed minimal ${jaildir}/etc/rcynic.conf" +else echo "Installing minimal ${jaildir}/etc/rcynic.conf failed" exit 1 fi |