Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/postinstall In do_sendmail, use unprefix to fix up ...



details:   https://anonhg.NetBSD.org/src/rev/34a6df18f60e
branches:  trunk
changeset: 796741:34a6df18f60e
user:      apb <apb%NetBSD.org@localhost>
date:      Mon Jun 16 08:29:18 2014 +0000

description:
In do_sendmail, use unprefix to fix up paths that will be
processed by obsolete_paths.

diffstat:

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

diffs (30 lines):

diff -r 7a30c77cf5a1 -r 34a6df18f60e usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall  Mon Jun 16 08:28:08 2014 +0000
+++ b/usr.sbin/postinstall/postinstall  Mon Jun 16 08:29:18 2014 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.169 2014/06/16 08:28:08 apb Exp $
+# $NetBSD: postinstall,v 1.170 2014/06/16 08:29:18 apb Exp $
 #
 # Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1346,11 +1346,13 @@
        for f in /etc/mail/helpfile /etc/mail/local-host-names \
            /etc/mail/sendmail.cf /etc/mail/submit.cf /etc/rc.d/sendmail \
            /etc/rc.d/smmsp /usr/share/misc/sendmail.hf \
-           $(find "${DEST_DIR}/usr/share/sendmail" -type f) \
-           $(find "${DEST_DIR}/usr/share/sendmail" -type d) \
-           "${DEST_DIR}/var/log/sendmail.st" \
-           "${DEST_DIR}/var/spool/clientmqueue" \
-           "${DEST_DIR}/var/spool/mqueue"; do
+           $( ( find "${DEST_DIR}/usr/share/sendmail" -type f ; \
+                find "${DEST_DIR}/usr/share/sendmail" -type d \
+              ) | unprefix "${DEST_DIR}" ) \
+           /var/log/sendmail.st" \
+           /var/spool/clientmqueue \
+           /var/spool/mqueue
+       do
                [ -e "${DEST_DIR}${f}" ] && echo "${f}"
        done | obsolete_paths "${op}"
        failed=$(( ${failed} + $? ))



Home | Main Index | Thread Index | Old Index