From 1662683cd8f36ba4b5c45e31fb3913c8c0984628 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 5 Nov 2003 09:42:08 +0000
Subject: - no need to mount totem clp - if we need lomount_clp again,
 correctly handle the "live" cmdline parameter

---
 move/move.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'move')

diff --git a/move/move.pm b/move/move.pm
index 8f9abd7f6..ef7f75438 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -68,6 +68,11 @@ sub lomount_clp {
     my ($name) = @_;
     my ($clp, $dir) = ("/image_raw/live_tree_$name.clp", "/image_$name");
 
+    if (! -e $clp || cat_('/proc/cmdline') =~ /\blive\b/) {
+	symlink "/image_raw/live_tree_$name", $dir;
+	return;
+    }
+
     mkdir_p($dir);
     my $dev = devices::find_free_loop();
     run_program::run('losetup', '-r', '-e', 'gz', $dev, $clp);
@@ -87,9 +92,6 @@ sub install2::startMove {
     require install_steps;
     install_steps::addUser($o);
 
-    #- need be done early because it provide some libs such as libssl which is needed for automatic printer config
-    lomount_clp('totem') if ! -x '/usr/bin/totem' && cat_('/proc/cmdline') !~ /\blive\b/;
-
     #- automatic printer, timezone, network configs
     require install_steps_interactive;
     install_steps_interactive::summaryBefore($o);
-- 
cgit v1.2.1