summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2012-05-06 22:13:00 +0000
committerOlivier Blin <blino@mageia.org>2012-05-06 22:13:00 +0000
commitf304c41f549c07ebace6dedc98aa2b1556b0a0aa (patch)
tree1cc1996cf8c0491a52f090fd9bab05c89cdb4867
parent399bbeb4c33857793d411ae4a2937cdec08500af (diff)
downloaddrakx-f304c41f549c07ebace6dedc98aa2b1556b0a0aa.tar
drakx-f304c41f549c07ebace6dedc98aa2b1556b0a0aa.tar.gz
drakx-f304c41f549c07ebace6dedc98aa2b1556b0a0aa.tar.bz2
drakx-f304c41f549c07ebace6dedc98aa2b1556b0a0aa.tar.xz
drakx-f304c41f549c07ebace6dedc98aa2b1556b0a0aa.zip
drakx-in-chroot: unmount /dev in chroot
-rw-r--r--perl-install/install/NEWS2
-rwxr-xr-xtools/drakx-in-chroot2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index f31a690ea..fd54c2895 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- drakx-in-chroot: unmount /dev in chroot
+
Version 14.20 - 6 May 2012
- bind mount /dev inside chroot rather than copy nodes (mga#5730)
diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot
index 42ebedb71..1ef65b62b 100755
--- a/tools/drakx-in-chroot
+++ b/tools/drakx-in-chroot
@@ -194,7 +194,7 @@ sub umount_all() {
my $err;
clean_stage2_updates();
my @procs = ('/proc/bus/usb', '/proc', '/sys', '/run/udev', '/run/initramfs', '/run');
- foreach ((map { "$prefix_ROOTED$_" } @procs, ''), @procs, $STAGE2_LOCATION_ROOTED, $LOOP_MOUNT_POINT, $MEDIA_LOCATION_ROOTED, $IMAGE_LOCATION_ROOTED) {
+ foreach ((map { "$prefix_ROOTED$_" } @procs, '/dev', ''), @procs, $STAGE2_LOCATION_ROOTED, $LOOP_MOUNT_POINT, $MEDIA_LOCATION_ROOTED, $IMAGE_LOCATION_ROOTED) {
my $dir = "$SLASH_LOCATION$_";
rmdir $dir;
if (-d $dir) {