diff options
| author |   espie <espie@openbsd.org> | 2014-07-11 13:37:02 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2014-07-11 13:37:02 +0000 |
| commit | b3b9a60af26d99ef54be5f6fee59a8ff8a6d5e15 (patch) | |
| tree | 358a403768158bac395612519f07a5fdffcc14dc | |
| parent | Fix incorrect duplicate mlinks (diff) | |
| download | wireguard-openbsd-b3b9a60af26d99ef54be5f6fee59a8ff8a6d5e15.tar.xz wireguard-openbsd-b3b9a60af26d99ef54be5f6fee59a8ff8a6d5e15.zip | |
use the merged 4.4BSD.dist mtree if BSD.local is gone
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgCheck.pm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm b/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm index 2ac0743a13f..aa52478c9b1 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgCheck.pm,v 1.49 2014/04/15 11:02:38 espie Exp $ +# $OpenBSD: PkgCheck.pm,v 1.50 2014/07/11 13:37:02 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -816,9 +816,14 @@ sub fill_localbase $state->{known}{$base."/lib/X11"}{'app-defaults'} = 1; $state->{known}{$base."/libdata"} = {}; $state->{known}{$base."/libdata/perl5"} = {}; - # XXX - OpenBSD::Mtree::parse($state->{known}, $base, - "/etc/mtree/BSD.local.dist", 1); + my $l = "/etc/mtree/BSD.local.dist"; + if (-f $l) { + # XXX + OpenBSD::Mtree::parse($state->{known}, $base, $l, 1); + } else { + OpenBSD::Mtree::parse($state->{known}, $state->destdir('/'), + "/etc/mtree/4.4BSD.dist", 1); + } } sub fill_root |