diff options
Diffstat (limited to 'rcynic')
| -rw-r--r-- | rcynic/Makefile.in | 3 | ||||
| -rw-r--r-- | rcynic/installation-scripts/linux/install.sh (renamed from rcynic/installation-scripts/linux/install.sh.in) | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/rcynic/Makefile.in b/rcynic/Makefile.in index bbcc587a..c19b9f8c 100644 --- a/rcynic/Makefile.in +++ b/rcynic/Makefile.in @@ -15,6 +15,7 @@ LDFLAGS = @LDFLAGS@ @LD_STATIC_FLAG@ LIBS = @LIBS@ AWK = @AWK@ +SORT= @SORT@ PYTHON = @PYTHON@ RRDTOOL = @RRDTOOL@ @@ -52,7 +53,7 @@ test: ${BIN} fi install: ${BIN} installation-scripts/install.sh - cd installation-scripts; host_os="${host_os}"; DESTDIR="${DESTDIR}"; . ./install.sh + cd installation-scripts; host_os="${host_os}"; DESTDIR="${DESTDIR}"; AWK="${AWK}"; SORT="${SORT}"; . ./install.sh uninstall deinstall: cd installation-scripts; host_os="${host_os}"; DESTDIR="${DESTDIR}"; . ./deinstall.sh diff --git a/rcynic/installation-scripts/linux/install.sh.in b/rcynic/installation-scripts/linux/install.sh index 9ca78f17..3c9a6412 100644 --- a/rcynic/installation-scripts/linux/install.sh.in +++ b/rcynic/installation-scripts/linux/install.sh @@ -10,9 +10,6 @@ : ${jailgroup="rcynic"} : ${setupcron="NO"} -AWK='@AWK@' -SORT='@SORT@' - echo "Setting up \"${jaildir}\" as a chroot jail for rcynic." if ${AWK} -F: -v jailgroup="${jailgroup}" 'BEGIN {status = 1} $1 == jailgroup {status = 0} END {exit status}' /etc/group @@ -62,7 +59,7 @@ if ! /bin/mkdir -p -v -m 555 \ "${jaildir}/bin" \ "${jaildir}/dev" \ "${jaildir}/etc/trust-anchors" \ - "${jaildir}/${libdir}" \ + "${jaildir}/${libdir}" \ "${jaildir}/usr/lib" \ "${jaildir}/data" then |