cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 2 issues, bogus next (patch by semarie@) and a more dire one: unpopulate

Browse Source 
should use accounted, not known.

Fixes snapshots + cleanup issue, ouchie. Issue found by semarie@ again.
This commit is contained in:
espie 2016-06-04 17:22:11 +00:00
parent 89b4cc123e
commit 4095c1c1c4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
infrastructure/bin/proot
View File

@ -1,6 +1,6 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: proot,v 1.50 2016/06/04 12:36:06 espie Exp $
# $OpenBSD: proot,v 1.51 2016/06/04 17:22:11 espie Exp $
#
# Copyright (c) 2016 Marc Espie <espie@openbsd.org>
#
@ -482,7 +482,7 @@ sub check_mountpoint
}
}
my $mnt = $root;
do {
do {{
if (!defined $dev->{$mnt}) {
$mnt = dirname($mnt);
next;
@ -494,7 +494,7 @@ sub check_mountpoint
$state->errsay("#1 is under #2 which does not have wxallowed",
$root, $mnt) if $wx->{$mnt} == 0;
return;
} while ($mnt ne dirname($mnt));
}} while ($mnt ne dirname($mnt));
$state->fatal_error("Couldn't find mountpoint for #1 ???", $root);
}
@ -905,7 +905,7 @@ sub unpopulate_chroot
$File::Find::prune = 1 if -d _;
return;
}
if ($state->{known}{$File::Find::name}) {
if ($state->{accounted}{$File::Find::name}) {
return;
}
$state->{progressmeter}->message($File::Find::name);