From 4095c1c1c4b54b5c5ebb304d73de28a92814063d Mon Sep 17 00:00:00 2001 From: espie Date: Sat, 4 Jun 2016 17:22:11 +0000 Subject: [PATCH] fix 2 issues, bogus next (patch by semarie@) and a more dire one: unpopulate should use accounted, not known. Fixes snapshots + cleanup issue, ouchie. Issue found by semarie@ again. --- infrastructure/bin/proot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/bin/proot b/infrastructure/bin/proot index 19c7f994275..a6460a4d999 100755 --- a/infrastructure/bin/proot +++ b/infrastructure/bin/proot @@ -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 # @@ -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);