Mon Jun 17 17:40:17 2013 UTC ()
don't echo the make command in the output file.


(christos)
diff -r1.153 -r1.154 src/usr.sbin/postinstall/postinstall

cvs diff -r1.153 -r1.154 src/usr.sbin/postinstall/Attic/postinstall (expand / switch to unified diff)

--- src/usr.sbin/postinstall/Attic/postinstall 2013/06/15 22:53:18 1.153
+++ src/usr.sbin/postinstall/Attic/postinstall 2013/06/17 17:40:17 1.154
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $NetBSD: postinstall,v 1.153 2013/06/15 22:53:18 christos Exp $ 3# $NetBSD: postinstall,v 1.154 2013/06/17 17:40:17 christos Exp $
4# 4#
5# Copyright (c) 2002-2008 The NetBSD Foundation, Inc. 5# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
6# All rights reserved. 6# All rights reserved.
7# 7#
8# This code is derived from software contributed to The NetBSD Foundation 8# This code is derived from software contributed to The NetBSD Foundation
9# by Luke Mewburn. 9# by Luke Mewburn.
10# 10#
11# Redistribution and use in source and binary forms, with or without 11# Redistribution and use in source and binary forms, with or without
12# modification, are permitted provided that the following conditions 12# modification, are permitted provided that the following conditions
13# are met: 13# are met:
14# 1. Redistributions of source code must retain the above copyright 14# 1. Redistributions of source code must retain the above copyright
15# notice, this list of conditions and the following disclaimer. 15# notice, this list of conditions and the following disclaimer.
16# 2. Redistributions in binary form must reproduce the above copyright 16# 2. Redistributions in binary form must reproduce the above copyright
@@ -1042,27 +1042,27 @@ do_motd() @@ -1042,27 +1042,27 @@ do_motd()
1042# 1042#
1043additem mtree "/etc/mtree/ being up to date" 1043additem mtree "/etc/mtree/ being up to date"
1044do_mtree() 1044do_mtree()
1045{ 1045{
1046 [ -n "$1" ] || err 3 "USAGE: do_mtree fix|check" 1046 [ -n "$1" ] || err 3 "USAGE: do_mtree fix|check"
1047 failed=0 1047 failed=0
1048 1048
1049 compare_dir "$1" "${SRC_DIR}/etc/mtree" "${DEST_DIR}/etc/mtree" 444 special 1049 compare_dir "$1" "${SRC_DIR}/etc/mtree" "${DEST_DIR}/etc/mtree" 444 special
1050 failed=$(( ${failed} + $? )) 1050 failed=$(( ${failed} + $? ))
1051 1051
1052 if ! $SOURCEMODE; then 1052 if ! $SOURCEMODE; then
1053 MTREE_DIR="${SRC_DIR}/etc/mtree" 1053 MTREE_DIR="${SRC_DIR}/etc/mtree"
1054 else 1054 else
1055 ${MAKE} -C "${SRC_DIR}/etc/mtree" emit_dist_file > \ 1055 ${MAKE} -s -C "${SRC_DIR}/etc/mtree" emit_dist_file > \
1056 "${SCRATCHDIR}/NetBSD.dist" 1056 "${SCRATCHDIR}/NetBSD.dist"
1057 MTREE_DIR="${SCRATCHDIR}" 1057 MTREE_DIR="${SCRATCHDIR}"
1058 fi 1058 fi
1059 compare_dir "$1" "${MTREE_DIR}" "${DEST_DIR}/etc/mtree" 444 NetBSD.dist 1059 compare_dir "$1" "${MTREE_DIR}" "${DEST_DIR}/etc/mtree" 444 NetBSD.dist
1060 failed=$(( ${failed} + $? )) 1060 failed=$(( ${failed} + $? ))
1061 1061
1062 return ${failed} 1062 return ${failed}
1063} 1063}
1064 1064
1065# 1065#
1066# named 1066# named
1067# 1067#
1068additem named "named configuration update" 1068additem named "named configuration update"