$NetBSD: patch-ab,v 1.7 2007/08/23 14:10:29 hauke Exp $ --- ra.sh.orig 2007-06-18 23:01:07.000000000 +0200 +++ ra.sh @@ -29,7 +29,7 @@ TLSLEVEL="_RADMIND_AUTHLEVEL" EDITOR=${EDITOR:-vi} USER=${SUDO_USER:-$USER} TMPDIR="${TMPDIR:=/tmp}" -DEFAULTS="/etc/defaults/radmind" +DEFAULTS="_PKG_SYSCONFDIR/radmind.defaults" FSDIFFROOT="." FLAG="_RADMIND_DIR/client/.RadmindRunning" CHECKEDOUT="_RADMIND_DIR/client/.CheckedOut" @@ -40,7 +40,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" @@ -56,14 +56,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