Browse Source

whitespace found during review

OPENBSD_6_0
deraadt 8 years ago
parent
commit
7476261c0f
4 changed files with 10 additions and 10 deletions
  1. +2
    -2
      src/etc/MAKEDEV.common
  2. +3
    -3
      src/etc/Makefile
  3. +2
    -2
      src/etc/Makefile.inc
  4. +3
    -3
      src/etc/rc

+ 2
- 2
src/etc/MAKEDEV.common View File

@ -1,4 +1,4 @@
vers(a, {-$OpenBSD: MAKEDEV.common,v 1.88 2016/05/21 15:17:49 deraadt Exp $-})dnl
vers(a, {-$OpenBSD: MAKEDEV.common,v 1.89 2016/05/26 16:29:51 deraadt Exp $-})dnl
dnl dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
dnl dnl
@ -430,7 +430,7 @@ _mkdev(au, audio*, {-M sound$U c major_au_c $U
MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound" MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"-})dnl MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"-})dnl
__devitem(vi, video*, Video V4L2 devices,video)dnl __devitem(vi, video*, Video V4L2 devices,video)dnl
_mkdev(vi, video*, {-M video$U c major_vi_c $U 600
_mkdev(vi, video*, {-M video$U c major_vi_c $U 600
MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"-})dnl MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"-})dnl
__devitem(asc, asc*, ASC Audio device)dnl __devitem(asc, asc*, ASC Audio device)dnl
_mkdev(asc, asc*, {-M asc$U major_asc_c 0-})dnl _mkdev(asc, asc*, {-M asc$U major_asc_c 0-})dnl


+ 3
- 3
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.424 2016/05/14 14:44:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.425 2016/05/26 16:29:51 deraadt Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -47,7 +47,7 @@ EXAMPLES=chio.conf dhclient.conf dhcpd.conf exports \
EXAMPLES_600=bgpd.conf dvmrpd.conf eigrpd.conf hostapd.conf iked.conf \ EXAMPLES_600=bgpd.conf dvmrpd.conf eigrpd.conf hostapd.conf iked.conf \
ipsec.conf ldapd.conf ldpd.conf ospf6d.conf ospfd.conf pf.conf \ ipsec.conf ldapd.conf ldpd.conf ospf6d.conf ospfd.conf pf.conf \
radiusd.conf rc.local rc.securelevel rc.shutdown relayd.conf \ radiusd.conf rc.local rc.securelevel rc.shutdown relayd.conf \
ripd.conf sasyncd.conf snmpd.conf vm.conf ypldap.conf
ripd.conf sasyncd.conf snmpd.conf vm.conf ypldap.conf
# -r-xr-xr-x # -r-xr-xr-x
RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd eigrpd ftpd \ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd eigrpd ftpd \
@ -213,7 +213,7 @@ distribution-etc-root-var: distrib-dirs
xargs sha256 -h ${DESTDIR}/var/sysmerge/etcsum || true xargs sha256 -h ${DESTDIR}/var/sysmerge/etcsum || true
cd ${DESTDIR}/ && \ cd ${DESTDIR}/ && \
sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \ sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \
pax -w -d | gzip -9 > ${DESTDIR}/var/sysmerge/etc.tgz
pax -w -d | gzip -9 > ${DESTDIR}/var/sysmerge/etc.tgz
distribution: distribution:
exec ${SUDO} ${MAKE} distribution-etc-root-var exec ${SUDO} ${MAKE} distribution-etc-root-var


+ 2
- 2
src/etc/Makefile.inc View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.7 2010/06/16 23:33:38 todd Exp $
# $OpenBSD: Makefile.inc,v 1.8 2016/05/26 16:29:51 deraadt Exp $
M=${.CURDIR:C/^.*\/etc\.([^\/]*)$/\1/} M=${.CURDIR:C/^.*\/etc\.([^\/]*)$/\1/}
@ -61,7 +61,7 @@ ${DOCDIR}/MAKEDEV.8: ${MAKEDEVDOC}
mdiffout1 > mdiffout2; \ mdiffout1 > mdiffout2; \
if [ -s mdiffout2 ]; then \ if [ -s mdiffout2 ]; then \
echo " m4 -I.. -I. ../MAKEDEV.man > ${DOCDIR}/MAKEDEV.8"; \ echo " m4 -I.. -I. ../MAKEDEV.man > ${DOCDIR}/MAKEDEV.8"; \
cp MAKEDEV.mtmp ${DOCDIR}/MAKEDEV.8 || true; \
cp MAKEDEV.mtmp ${DOCDIR}/MAKEDEV.8 || true; \
${NOCLEAN} rm MAKEDEV.mtmp; \ ${NOCLEAN} rm MAKEDEV.mtmp; \
fi; \ fi; \
${NOCLEAN} rm -f mdiffout1 mdiffout2; \ ${NOCLEAN} rm -f mdiffout1 mdiffout2; \


+ 3
- 3
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.481 2016/05/26 14:59:48 rpe Exp $
# $OpenBSD: rc,v 1.482 2016/05/26 16:29:51 deraadt Exp $
# System startup script run by init on autoboot or after single-user. # System startup script run by init on autoboot or after single-user.
# Output and error are redirected to console by init, and the console is the # Output and error are redirected to console by init, and the console is the
@ -210,7 +210,7 @@ reorder_libs() {
if $_remount; then if $_remount; then
mount -u -r $_dkdev mount -u -r $_dkdev
fi fi
echo ' done.' echo ' done.'
} }
@ -311,7 +311,7 @@ if [[ $1 == shutdown ]]; then
exit 0 exit 0
fi fi
# Add swap block-devices.
# Add swap block-devices.
swapctl -A -t blk swapctl -A -t blk
if [[ -e /fastboot ]]; then if [[ -e /fastboot ]]; then


Loading…
Cancel
Save