blob: 1263c8be93e0e99b271609f1f51ecb3b7a365325 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
$NetBSD: patch-ab,v 1.3 2006/01/18 13:11:56 joerg Exp $
--- ra.sh.orig 2005-12-07 21:10:01.000000000 +0100
+++ ra.sh
@@ -24,7 +24,7 @@ KFILE="_RADMIND_COMMANDFILE"
SERVER="_RADMIND_HOST"
TLSLEVEL="_RADMIND_AUTHLEVEL"
EDITOR=${EDITOR:-vi}
-DEFAULTS="/etc/defaults/radmind"
+DEFAULTS="_PKG_SYSCONFDIR/radmind.defaults"
FSDIFFROOT="."
FLAG="_RADMIND_DIR/client/.RadmindRunning"
CHECKEDOUT="_RADMIND_DIR/client/.CheckedOut"
@@ -34,7 +34,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"
@@ -50,14 +50,6 @@ fi
LTMP="${TMPDIR}/lapply.out"
FTMP="${TMPDIR}/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
@@ -88,7 +80,7 @@ cleanup() {
dopreapply() {
if [ -d ${PREAPPLY} ]; then
- SCRIPTS=`find ${PREAPPLY} -perm +u+x \! -type d | sort`
+ SCRIPTS=`find ${PREAPPLY} -perm -u+x \! -type d | sort`
if [ ${SCRIPTS} ]; then
for script in ${SCRIPTS}; do
${script} "$1"
@@ -99,7 +91,7 @@ dopreapply() {
dopostapply() {
if [ -d ${POSTAPPLY} ]; then
- SCRIPTS=`find ${POSTAPPLY} -perm +u+x \! -type d | sort`
+ SCRIPTS=`find ${POSTAPPLY} -perm -u+x \! -type d | sort`
if [ ${SCRIPTS} ]; then
for script in ${SCRIPTS}; do
${script} "$1"
|
