diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-07-11 13:21:09 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-07-11 13:21:09 +0000 |
| commit | 20dcd94b366f2b1fc8f0172be494289ac5ec0e0e (patch) | |
| tree | 325af277e5e1f2aa7f17a1d787f446625edc4a93 /distrib/miniroot | |
| parent | 8c955fe3ca0304bb868d51889730b7f736b0e60e (diff) | |
take the directories specified by BSD.local.dist, and add them into
4.4BSD.dist. The base set grows by a tiny amount, but we no longer
need to run chroot'd dynamic mtree from the installer.
ok espie halex schwarze
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sub | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 6f669ed9b8f..782506856de 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.776 2014/06/16 19:31:41 rpe Exp $ +# $OpenBSD: install.sub,v 1.777 2014/07/11 13:21:08 deraadt Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. @@ -1955,11 +1955,6 @@ finish_up() { # dynamic. That is highly discouraged, but let us play it safe. rm -f /mnt/var/run/ld.so.hints - if [ -f /mnt/etc/mtree/BSD.local.dist ]; then - /mnt/usr/sbin/chroot /mnt /usr/sbin/mtree -Uedqn -p /usr/local \ - -f /etc/mtree/BSD.local.dist >/dev/null - fi - [ -x /mnt/$MODE.site ] && /mnt/usr/sbin/chroot /mnt /$MODE.site # In case this is a softraid device, make sure all underlying |