summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-11-25 09:25:36 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-11-25 09:25:36 +0000
commit34a425dcd002602d1f82ca540d498a3f940d1bdb (patch)
treedfd79d978bff6d00e6a16e51d4454e11ce472573
parent8a606f702f7972827dd458d4155328983d36e893 (diff)
downloaddrakx-34a425dcd002602d1f82ca540d498a3f940d1bdb.tar
drakx-34a425dcd002602d1f82ca540d498a3f940d1bdb.tar.gz
drakx-34a425dcd002602d1f82ca540d498a3f940d1bdb.tar.bz2
drakx-34a425dcd002602d1f82ca540d498a3f940d1bdb.tar.xz
drakx-34a425dcd002602d1f82ca540d498a3f940d1bdb.zip
- nvidia.clp support
- handle umounting failure by remounting what can be and calling mdk_totem again (which will hopefully tell what program did make umounting fail)
-rwxr-xr-xmove/tree/mdk_behind_totem8
1 files changed, 5 insertions, 3 deletions
diff --git a/move/tree/mdk_behind_totem b/move/tree/mdk_behind_totem
index c12bf5d7d..e098f0196 100755
--- a/move/tree/mdk_behind_totem
+++ b/move/tree/mdk_behind_totem
@@ -41,8 +41,10 @@ umount_cd() {
losetup -d /dev/$boot_loop
ln -sf /image_always/lib /
- umount /image
- /image_always/sbin/losetup -d /dev/$main_loop
+
+ umount /image && \
+ /image_always/sbin/losetup -d /dev/$main_loop || { mount_cd; kill $totem_pid; exec mdk_totem; }
+
/image_always/usr/bin/eject
}
@@ -56,7 +58,7 @@ mount_cd() {
ln -sf /image/lib /
- mdk_move_loop to_cdrom always always_i18n totem
+ mdk_move_loop to_cdrom always always_i18n totem nvidia
}
while [ -e "/proc/$totem_pid" ]; do