summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-11-27 14:45:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-11-27 14:45:37 +0000
commitc62dfcf9f5568aebea8ba5547a00d05bb2c94a00 (patch)
tree61de554dfb697219b2b0e1e6348276731c051511
parentc54d6f1143b4ebdfe70c077a25e2b405437bc3c9 (diff)
downloaddrakx-c62dfcf9f5568aebea8ba5547a00d05bb2c94a00.tar
drakx-c62dfcf9f5568aebea8ba5547a00d05bb2c94a00.tar.gz
drakx-c62dfcf9f5568aebea8ba5547a00d05bb2c94a00.tar.bz2
drakx-c62dfcf9f5568aebea8ba5547a00d05bb2c94a00.tar.xz
drakx-c62dfcf9f5568aebea8ba5547a00d05bb2c94a00.zip
fake umounting /image when we use live_tree/ instead of live_tree.clp
-rwxr-xr-xmove/tree/mdk_behind_totem12
1 files changed, 9 insertions, 3 deletions
diff --git a/move/tree/mdk_behind_totem b/move/tree/mdk_behind_totem
index 094c70d83..e7a37f3b4 100755
--- a/move/tree/mdk_behind_totem
+++ b/move/tree/mdk_behind_totem
@@ -42,7 +42,9 @@ umount_cd() {
ln -sf /image_always/lib /
- if [ ! -l /image ]; then
+ if [ -l /image ]; then
+ rm -f /image
+ else
umount /image && \
/image_always/sbin/losetup -d /dev/$main_loop || { mount_cd; kill $totem_pid; exec mdk_totem; }
fi
@@ -52,8 +54,12 @@ umount_cd() {
mount_cd() {
echo mount_cd
- /image_always/sbin/losetup -r -e gz /dev/$main_loop /cdrom/live_tree.clp
- /image_always/bin/mount /dev/$main_loop /image
+ if [ -e /cdrom/live_tree.clp ]; then
+ /image_always/sbin/losetup -r -e gz /dev/$main_loop /cdrom/live_tree.clp
+ /image_always/bin/mount /dev/$main_loop /image
+ else
+ ln -sf /cdrom/live_tree /image
+ fi
losetup -r -e gz /dev/$boot_loop /cdrom/live_tree_boot.clp
mount /dev/$boot_loop /image_boot