[src/netbsd-7]: src/usr.sbin/postinstall Pull up following revision(s) (reque...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8c16fcaa5191
branches:  netbsd-7
changeset: 799334:8c16fcaa5191
user:      snj <snj%NetBSD.org@localhost>
date:      Sat May 16 03:45:21 2015 +0000

description:
Pull up following revision(s) (requested by jnemeth in ticket #773):
        usr.sbin/postinstall/postinstall: revisions 1.184, 1.187
Handle obsolete xen/pae-xen kernel modules; reported by John D. Baker.
--
add powerpc variants to the list of potentially obsolete modules to check

diffstat:

 usr.sbin/postinstall/postinstall |  16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r 913a73d92b7d -r 8c16fcaa5191 usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall  Fri May 15 04:16:23 2015 +0000
+++ b/usr.sbin/postinstall/postinstall  Sat May 16 03:45:21 2015 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.175.2.4 2015/04/18 09:39:17 martin Exp $
+# $NetBSD: postinstall,v 1.175.2.5 2015/05/16 03:45:21 snj Exp $
 #
 # Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -641,7 +641,7 @@
        local dir="$1"
        local subdir
 
-       if ! [ -d "${DEST_DIR}/${dir}" ]; then
+       if ! [ -d "${DEST_DIR}${dir}" ]; then
                msg "${DEST_DIR}${dir} doesn't exist; can't check for obsolete files"
                return 1
        fi
@@ -652,7 +652,7 @@
        | tail -n +2 \
        | while read subdir ; do
                subdir="${subdir%/.}"
-               find "${DEST_DIR}/${dir#/}/${subdir}" -depth -print
+               find "${DEST_DIR}${dir}/${subdir}" -depth -print
        done \
        | unprefix "${DEST_DIR}"
 }
@@ -2008,7 +2008,15 @@
        op="$1"
        failed=0
 
-       obsolete_stand "/stand/${MACHINE}" | obsolete_paths "${op}"
+       for dir in \
+           /stand/${MACHINE} \
+           /stand/${MACHINE}-4xx \
+           /stand/${MACHINE}-booke \
+           /stand/${MACHINE}-xen \
+           /stand/${MACHINE}pae-xen
+       do
+               [ -d "${DESTDIR}${dir}" ] && obsolete_stand "${dir}"
+       done | obsolete_paths "${op}"
        failed=$(( ${failed} + $? ))
 
        return ${failed}