diff --git a/src/etc/Makefile b/src/etc/Makefile index d7516c2c..194150ec 100644 --- a/src/etc/Makefile +++ b/src/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.336 2013/10/10 00:59:18 dtucker Exp $ +# $OpenBSD: Makefile,v 1.337 2013/11/03 18:28:34 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -26,7 +26,7 @@ kernels: bootblocks ${ALL_KERNELS} .for CONF K in ${KERNELS} cp ../sys/arch/${MACHINE}/compile/${CONF}/bsd ${RELEASEDIR}/$K .endfor - + # -rw-r--r-- BINOWN= root BINGRP= wheel @@ -324,7 +324,6 @@ distrib: .PHONY: distribution-etc-root-var distribution distrib-dirs \ release allarchs kernels release-sets m4 install-mtree \ bootblocks ${ALL_KERNELS} - SUBDIR+= etc.alpha etc.amd64 etc.armish etc.armv7 etc.aviion etc.hp300 SUBDIR+= etc.hppa etc.hppa64 etc.i386 etc.landisk etc.loongson etc.luna88k diff --git a/src/etc/daily b/src/etc/daily index b449d93f..ff27e5c9 100644 --- a/src/etc/daily +++ b/src/etc/daily @@ -1,5 +1,5 @@ # -# $OpenBSD: daily,v 1.76 2013/01/06 14:11:12 deraadt Exp $ +# $OpenBSD: daily,v 1.77 2013/11/03 18:28:34 deraadt Exp $ # From: @(#)daily 8.2 (Berkeley) 1/25/94 # # For local additions, create the file /etc/daily.local. @@ -49,7 +49,7 @@ if [ -d /tmp -a ! -L /tmp ]; then cd /tmp && { find -x . \ \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \ - -o -path ./portslocks \) \ + -o -path ./portslocks \) \ -prune -o -type f -atime +3 -execdir rm -f -- {} \; 2>/dev/null find -x . -type d -mtime +1 ! -path ./vi.recover ! -path ./.X11-unix \ ! -path ./.ICE-unix ! -path ./portslocks ! -name . \ @@ -60,7 +60,7 @@ if [ -d /var/tmp -a ! -L /var/tmp ]; then cd /var/tmp && { find -x . \ \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \ - -o -path ./portslocks \) \ + -o -path ./portslocks \) \ -prune -o ! -type d -atime +7 -execdir rm -f -- {} \; 2>/dev/null find -x . -type d -mtime +1 ! -path ./vi.recover ! -path ./.X11-unix \ ! -path ./.ICE-unix ! -path ./portslocks ! -name . \ @@ -108,7 +108,7 @@ while [ "X$ROOTBACKUP" = X1 ]; do IFS=, for d in `sysctl -n hw.disknames`; do # If the provided disk name is a duid, substitute the device. - if [ X$bakdisk = X${d#*:} ]; then + if [ X$bakdisk = X${d#*:} ]; then bakdisk=${d%:*} rootbak=$bakdisk$bakpart fi