Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/postinstall Make do_mtree correctly report failure ...
details: https://anonhg.NetBSD.org/src/rev/a7c7b82463f7
branches: trunk
changeset: 747574:a7c7b82463f7
user: njoly <njoly%NetBSD.org@localhost>
date: Mon Sep 21 18:03:03 2009 +0000
description:
Make do_mtree correctly report failure if either special or
NetBSD.dist checks failed, not only the last one.
diffstat:
usr.sbin/postinstall/postinstall | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diffs (33 lines):
diff -r 78f3093384eb -r a7c7b82463f7 usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall Mon Sep 21 17:20:16 2009 +0000
+++ b/usr.sbin/postinstall/postinstall Mon Sep 21 18:03:03 2009 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.103 2009/09/07 21:07:04 mrg Exp $
+# $NetBSD: postinstall,v 1.104 2009/09/21 18:03:03 njoly Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -923,8 +923,11 @@
do_mtree()
{
[ -n "$1" ] || err 3 "USAGE: do_mtree fix|check"
+ failed=0
compare_dir "$1" "${SRC_DIR}/etc/mtree" "${DEST_DIR}/etc/mtree" 444 special
+ failed=$(( ${failed} + $? ))
+
if ! $SOURCEMODE; then
MTREE_DIR="${SRC_DIR}/etc/mtree"
else
@@ -938,6 +941,9 @@
MTREE_DIR="${SCRATCHDIR}"
fi
compare_dir "$1" "${MTREE_DIR}" "${DEST_DIR}/etc/mtree" 444 NetBSD.dist
+ failed=$(( ${failed} + $? ))
+
+ return ${failed}
}
#
Home |
Main Index |
Thread Index |
Old Index