$NetBSD: patch-ab,v 1.8 2008/11/20 13:45:29 hauke Exp $ --- ra.sh.orig 2008-06-05 02:08:07.000000000 +0200 +++ ra.sh @@ -30,7 +30,7 @@ EDITOR=${EDITOR:-vi} PAGER=${PAGER:-cat} USER=${SUDO_USER:-$USER} TMPDIR="${TMPDIR:=/tmp}" -DEFAULTS="/etc/defaults/radmind" +DEFAULTS="_PKG_SYSCONFDIR/radmind.defaults" FSDIFFROOT="." DEFAULTWORKDIR="/" FLAG="_RADMIND_DIR/client/.RadmindRunning" @@ -42,7 +42,7 @@ VERSION=_RADMIND_VERSION PREAPPLY="_RADMIND_PREAPPLY" POSTAPPLY="_RADMIND_POSTAPPLY" -PATH=/usr/local/bin:/usr/bin:/bin; export PATH +PATH=_LOCALBASE/bin:/usr/bin:/bin; export PATH RETRY=10 MKTEMP="_RADMIND_MKTEMP" @@ -58,14 +58,6 @@ fi LTMP="${RASHTMP}/lapply.out" FTMP="${RASHTMP}/fsdiff.out" -# different systems use different default dirs -if [ ! -f "${DEFAULTS}" ]; then - DEFAULTS="/etc/default/radmind" - if [ ! -f "${DEFAULTS}" ]; then - DEFAULTS="/etc/radmind.defaults" - fi -fi - Yn() { $ECHO -n "$*" "[Yn] " read ans