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 "fix ptyfsoldnodes" more verbose



details:   https://anonhg.NetBSD.org/src/rev/76d462fe380c
branches:  trunk
changeset: 780970:76d462fe380c
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Aug 13 15:17:16 2012 +0000

description:
Make "fix ptyfsoldnodes" more verbose

diffstat:

 usr.sbin/postinstall/postinstall |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 827ff6ee1d7b -r 76d462fe380c usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall  Mon Aug 13 13:12:51 2012 +0000
+++ b/usr.sbin/postinstall/postinstall  Mon Aug 13 15:17:16 2012 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.139 2012/08/13 10:20:52 martin Exp $
+# $NetBSD: postinstall,v 1.140 2012/08/13 15:17:16 martin Exp $
 #
 # Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1774,14 +1774,19 @@
 
                if [ ${pcnt} -gt 0 -o ${tcnt} -gt 0 ]; then
                        if [ "$1" = "fix" ]; then
+                               tmp="$(mktemp /tmp/postinstall.ptyfs.XXXXXXXX)"
                                find "${DEST_DIR}/dev" -xdev -type c -ls | \
                                        ${AWK} '{print $7 $12}' | \
                                        ${AWK} -F, "/^${maj_p},/{ print \$2}" \
-                                       | xargs rm
+                                       > "${tmp}"
                                find "${DEST_DIR}/dev" -xdev -type c -ls | \
                                        ${AWK} '{print $7 $12}' | \
                                        ${AWK} -F, "/^${maj_t},/{ print \$2}" \
-                                       | xargs rm
+                                       >> "${tmp}"
+                               while read node; do
+                                       rm "${node}"
+                                       msg "Removed ${node}"
+                               done < "${tmp}"
                        else
                                failed=1
                        fi



Home | Main Index | Thread Index | Old Index