diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2008-05-14 15:31:42 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2008-05-14 15:31:42 +0000 |
| commit | dab1f285bb88e37b89850b79c7a22658fa3f0035 (patch) | |
| tree | 6816a186970df48a2d269fda89f1cb61df2f6162 | |
| parent | c12ec687d8b7a535cd6fda7044c5e323be026ccc (diff) | |
- fix new directory creation by using the correct variable;
spotted by merdely@ while trying to populate /var/www from scratch
ok merdely@
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index c1b4498a23a..42a9119d97d 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.6 2008/05/14 07:48:36 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.7 2008/05/14 15:31:41 ajacoutot Exp $ # # This script is based on the FreeBSD mergemaster script, written by # Douglas Barton <DougB@FreeBSD.org> @@ -124,7 +124,7 @@ mm_install() { if [ -z "${INSTDIR}" ]; then INSTDIR=/; fi - DIR_OWN=`stat -f "%OMp%OLp" "${TEMPROOT}/${INSTDIR}"` + DIR_MODE=`stat -f "%OMp%OLp" "${TEMPROOT}/${INSTDIR}"` eval `stat -f "FILE_MODE=%OMp%OLp FILE_OWN=%Su FILE_GRP=%Sg" ${1}` if [ -n "${DESTDIR}${INSTDIR}" -a ! -d "${DESTDIR}${INSTDIR}" ]; then |