summaryrefslogtreecommitdiffstats
path: root/move/move.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-11-05 09:42:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-11-05 09:42:08 +0000
commit1662683cd8f36ba4b5c45e31fb3913c8c0984628 (patch)
tree2ae80b6eeb14a67d6031a1c24abbe1ce8dacf42c /move/move.pm
parent880794c9b26f5aa1d8bab4261e55b4588531d5b4 (diff)
downloaddrakx-1662683cd8f36ba4b5c45e31fb3913c8c0984628.tar
drakx-1662683cd8f36ba4b5c45e31fb3913c8c0984628.tar.gz
drakx-1662683cd8f36ba4b5c45e31fb3913c8c0984628.tar.bz2
drakx-1662683cd8f36ba4b5c45e31fb3913c8c0984628.tar.xz
drakx-1662683cd8f36ba4b5c45e31fb3913c8c0984628.zip
- no need to mount totem clp
- if we need lomount_clp again, correctly handle the "live" cmdline parameter
Diffstat (limited to 'move/move.pm')
-rw-r--r--move/move.pm8
1 files changed, 5 insertions, 3 deletions
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);