From c915dfb3fb98c5c404c70ae578e7c8f77042ba27 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Thu, 30 Oct 2008 19:26:45 +0000 Subject: extract post-pivot root modules clean in per-loop-type pivot_clean sub --- lib/MDV/Draklive/Loopback.pm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/MDV/Draklive/Loopback.pm') diff --git a/lib/MDV/Draklive/Loopback.pm b/lib/MDV/Draklive/Loopback.pm index c9dbd9c..253a56a 100644 --- a/lib/MDV/Draklive/Loopback.pm +++ b/lib/MDV/Draklive/Loopback.pm @@ -61,6 +61,13 @@ our %loop_types; my $media_loopbacks = $live->get_media_prefix('loopbacks'); "sh -c 'modules=; for m in $live->{prefix}{live}{mnt}$live->{prefix}{media}{mnt}${media_loopbacks}$dir->{path}/*; do n=\$(basename \$m); n=\${n%.sqfs}; d=$live->{prefix}{live}{mnt}$dir->{mountpoint}/\$n; mkdir -p \$d; mount -n -o loop,ro -t squashfs \$m \$d && modules=\$modules\$d=ro:; done; echo \$modules | sed -e s/:\$// > $live->{prefix}{live}{mnt}/$dir->{list}'"; }, + pivot_clean => sub { + my ($live, $dir, $initrdroot) = @_; + ( + "sh -c 'cd $initrdroot$live->{prefix}{live}{mnt}$dir->{mountpoint}; for i in `ls -1`; do mkdir -p $live->{prefix}{live}{mnt}$dir->{mountpoint}/\$i; mount -n --move \$i $live->{prefix}{live}{mnt}$dir->{mountpoint}/\$i; rmdir \$i; done; rmdir $initrdroot$live->{prefix}{live}{mnt}$dir->{mountpoint}'", + "sh -c 'mv $initrdroot$live->{prefix}{live}{mnt}/$dir->{list} $live->{prefix}{live}{mnt}/'", + ); + }, }, loopfs => { is_loopback => 1, -- cgit v1.2.1