From 231bb2f0b5fc69fa313e95cf3ddd5d0e06678e07 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 30 Oct 2008 19:05:19 +0000
Subject: do not remove /live/union if not existing

---
 lib/MDV/Draklive/Initrd.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/MDV/Draklive/Initrd.pm')

diff --git a/lib/MDV/Draklive/Initrd.pm b/lib/MDV/Draklive/Initrd.pm
index bf13508..0d98f74 100644
--- a/lib/MDV/Draklive/Initrd.pm
+++ b/lib/MDV/Draklive/Initrd.pm
@@ -215,7 +215,7 @@ sub create_initrd_scriptlet {
                           "sh -c 'umount /proc/bus/usb 2>/dev/null'",
                           "umount /proc",
                           "pivot_root $target $target/initrd",
-                          q(sh -c 'rmdir /initrd/live/union'),
+                          if_($live->{mount}{root}, qq(sh -c 'rmdir /initrd$live->{prefix}{live}{mnt}$live->{mount}{root}')),
                           q(sh -c 'if [ -d /initrd/live/modules ]; then cd /initrd/live/modules; for i in `ls -1`; do mkdir -p /live/modules/$i; mount -n --move $i /live/modules/$i; rmdir $i; done; rmdir /initrd/live/modules; fi'),
                           (map { qq(sh -c 'mv /initrd/live/$_->{list} /live/') } grep { $_->{list} } @{$live->{mount}{dirs} || []}),
                           q(sh -c 'cd /initrd/live; for i in `ls -1`; do [ -d $i ] || continue; mkdir -p /live/$i; mount -n --move $i /live/$i; rmdir $i; done'),
-- 
cgit v1.2.1