summaryrefslogtreecommitdiff
path: root/distrib/miniroot
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2015-01-29 17:47:09 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2015-01-29 17:47:09 +0000
commit2835dfe3b46ca1b83eee7c98cc6e914cd6e66a42 (patch)
tree8b5eec58b5783036e866e93cfc220fca3f1fd973 /distrib/miniroot
parent4666b04ea2194da4fc9852ba2e471f7d7714d86a (diff)
At upgrade time delete sendmail,named,nginx,openssl binaries because
they may reside earlier in the path than a pkg. prompted by tedu, with halex
Diffstat (limited to 'distrib/miniroot')
-rw-r--r--distrib/miniroot/upgrade.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh
index d6c450140d6..a9ddcc90cfc 100644
--- a/distrib/miniroot/upgrade.sh
+++ b/distrib/miniroot/upgrade.sh
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: upgrade.sh,v 1.80 2014/12/10 08:57:41 giovanni Exp $
+# $OpenBSD: upgrade.sh,v 1.81 2015/01/29 17:47:08 deraadt Exp $
# $NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -87,5 +87,9 @@ feed_random
# Install sets.
install_sets
+# XXX To be removed after 5.8 is released.
+rm -rf /mnt/usr/libexec/sendmail
+rm -f /mnt/usr/sbin/{named,nginx,openssl}
+
# Perform final steps common to both an install and an upgrade.
finish_up