summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/fs/any.pm2
-rw-r--r--perl-install/fs/mount.pm2
-rw-r--r--perl-install/install/any.pm4
-rw-r--r--perl-install/install/gtk.pm22
-rw-r--r--perl-install/install/install2.pm11
-rw-r--r--perl-install/install/steps_gtk.pm10
-rw-r--r--perl-install/lang.pm3
-rw-r--r--perl-install/modules.pm2
9 files changed, 10 insertions, 48 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 54ef4694d..3311f87e8 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -924,7 +924,6 @@ when your installation is complete and you restart your system.")),
#- very special cases for langs which do not like UTF-8
$non_utf8 = $lang =~ /\bzh/ if !$utf8_forced;
}, focus_out => sub { $langs->{$listval2val->($lang)} = 1 } },
- if_(!$::move,
{ val => \$non_utf8, type => 'bool', text => N("Old compatibility (non UTF-8) encoding"),
advanced => 1, changed => sub { $utf8_forced = 1 } },
{ val => \$langs->{all}, type => 'bool', text => N("All languages"), advanced => 1 },
@@ -934,7 +933,6 @@ when your installation is complete and you restart your system.")),
image => "langs/lang-$_->[0]",
};
} sort { $a->[1] cmp $b->[1] } map { [ $_, $sort_func->($_) ] } lang::list_langs(),
- ),
]) or return;
$locale->{utf8} = !$non_utf8;
%$langs = grep_each { $::b } %$langs; #- clean hash
diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
index 53e526ba1..03abd0573 100644
--- a/perl-install/fs/any.pm
+++ b/perl-install/fs/any.pm
@@ -13,7 +13,7 @@ sub get_hds {
my $probed_all_hds = fsedit::get_hds($partitioning_flags, $o_in);
my $hds = $probed_all_hds->{hds};
- if (is_empty_array_ref($hds) && !$::move) { #- no way
+ if (is_empty_array_ref($hds)) { #- no way
die N("An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem");
}
diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm
index 5687ac4d3..f22283573 100644
--- a/perl-install/fs/mount.pm
+++ b/perl-install/fs/mount.pm
@@ -40,7 +40,7 @@ sub mount {
push @types, 'smb', 'smbfs', 'davfs2' if !$::isInstall;
- if (!member($fs, @types) && !$::move) {
+ if (!member($fs, @types)) {
log::l("skipping mounting $dev partition ($fs)");
return;
}
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index fd93f0fda..95b18964f 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -27,12 +27,8 @@ our @advertising_images;
sub drakx_version {
my ($o) = @_;
- if ($::move) {
- sprintf "DrakX-move v%s", cat_('/usr/bin/stage2/move.pm') =~ /move\.pm,v (\S+ \S+ \S+)/;
- } else {
my $version = cat__(getFile_($o->{stage2_phys_medium}, "install/stage2/VERSION"));
sprintf "DrakX v%s", chomp_($version);
- }
}
#-######################################################################################
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm
index 6d21e6c23..dcb30f8a4 100644
--- a/perl-install/install/gtk.pm
+++ b/perl-install/install/gtk.pm
@@ -60,20 +60,6 @@ sub load_rc {
if ($f) {
Gtk2::Rc->parse_string($o->{doc} ? $theme_overriding_for_doc : scalar cat_($f));
}
-
- if ($::move) {
- #- override selection color since we will not do inverse-video on the text when it's images
- Gtk2::Rc->parse_string(q(
-style "galaxy-default"
-{
- base[ACTIVE] = "#CECECE"
- base[SELECTED] = "#CECECE"
- text[ACTIVE] = "#000000"
- text[PRELIGHT] = "#000000"
- text[SELECTED] = "#000000"
-}
-));
- }
}
#------------------------------------------------------------------------------
@@ -100,7 +86,6 @@ widget "*" style "default-font"
#------------------------------------------------------------------------------
sub default_theme {
my ($o) = @_;
- $::move ? '' :
$o->{simple_themes} || $o->{vga16} ? 'blue' : 'galaxy';
}
@@ -110,11 +95,9 @@ sub install_theme {
load_rc($o, $o->{theme} ||= default_theme($o));
load_font($o);
- if (!$::move) {
my $win = gtknew('Window', widget_name => 'background');
$win->realize;
mygtk2::set_root_window_background_with_gc($win->style->bg_gc('normal'));
- }
}
#------------------------------------------------------------------------------
@@ -176,7 +159,7 @@ sub update_steps_position {
sub create_logo_window {
my ($o) = @_;
- return if $::logowidth == 0 || $::move;
+ return if $::logowidth == 0;
mygtk2::may_destroy($o->{logo_window});
@@ -216,11 +199,10 @@ q(<fontconfig>
sub init_sizes {
my ($o) = @_;
($::rootwidth, $::rootheight) = (Gtk2::Gdk->screen_width, Gtk2::Gdk->screen_height);
- $::stepswidth = $::rootwidth <= 640 ? 0 : 200 if !$::move;
+ $::stepswidth = $::rootwidth <= 640 ? 0 : 200;
($::logowidth, $::logoheight) = $::rootwidth <= 640 ? (0, 0) : (800, 75);
($o->{windowwidth}, $o->{windowheight}) = ($::rootwidth - $::stepswidth, $::rootheight - $::helpheight - $::logoheight);
($::real_windowwidth, $::real_windowheight) = (576, 418);
- $::move and $o->{windowwidth} -= 100;
}
sub handle_unsafe_mouse {
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 93c0029eb..5d50eae6c 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -377,7 +377,6 @@ sub main {
rpm_dbapi => sub { $o->{rpm_dbapi} = $v },
nomouseprobe => sub { $o->{nomouseprobe} = $v },
updatemodules => sub { $o->{updatemodules} = 1 },
- move => sub { $::move = 1 },
suppl => sub { $o->{supplmedia} = 1 },
askmedia => sub { $o->{askmedia} = 1 },
}}{lc $n}; &$f if $f;
@@ -400,10 +399,6 @@ sub main {
eval { fs::mount::mount('none', '/sys', 'sysfs', 1) };
eval { touch('/root/non-chrooted-marker.DrakX') }; #- helps distinguishing /root and /mnt/root when we don't know if we are chrooted
- if ($::move) {
- require move;
- move::init($o);
- }
if ($::local_install) {
push @auto,
# 'selectLanguage', 'selectKeyboard', 'miscellaneous', 'selectInstallClass',
@@ -413,7 +408,7 @@ sub main {
$o->{mouse} = mouse::fullname2mouse('Universal|Any PS/2 & USB mice');
}
- $o->{prefix} = $::prefix = $::testing ? "/tmp/test-perl-install" : $::move ? "" : "/mnt";
+ $o->{prefix} = $::prefix = $::testing ? "/tmp/test-perl-install" : "/mnt";
mkdir $::prefix, 0755;
#- make sure we do not pick up any gunk from the outside world
@@ -531,7 +526,7 @@ sub main {
mouse::load_modules($o->{mouse});
}
- lang::set($o->{locale}) if !$::move;
+ lang::set($o->{locale});
# keep the result otherwise monitor-edid does not return good results afterwards
eval { any::monitor_full_edid() };
@@ -540,7 +535,7 @@ sub main {
$o->{allowFB} = listlength(cat_("/proc/fb"));
- if (!$::move && !$::testing) {
+ if (!$::testing) {
my $product_id = cat__(install::any::getFile_($o->{stage2_phys_medium}, "product.id"));
log::l('product_id: ' . chomp_($product_id));
$o->{product_id} = common::parse_LDAP_namespace_structure($product_id);
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 7f71a359e..6ba5ec39e 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -47,7 +47,7 @@ sub new($$) {
my @options = $wanted_DISPLAY;
if ($server eq 'Xnest') {
push @options, '-ac', '-geometry', $o->{vga} || ($o->{vga16} ? '640x480' : '800x600');
- } elsif (!$::move) {
+ } else {
install::gtk::createXconf($f, @{$o->{mouse}}{'Protocol', 'device'}, $o->{mouse}{wacom}[0], $Driver);
push @options, '-kb', '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/;
@@ -106,13 +106,6 @@ sub new($$) {
@servers = map { if_($_, "Driver:$_") } $card && $card->{Driver}, 'fbdev';
}
- if ($::move && !$::testing) {
- require move;
- require run_program;
- move::automatic_xconf($o);
- @servers = qw(X_move);
- }
-
foreach (@servers) {
log::l("Trying with server $_");
my ($prog, $Driver) = /Driver:(.*)/ ? ('Xorg', $1) : /Xsun|Xnest|^X_move$/ ? $_ : "XF86_$_";
@@ -125,7 +118,6 @@ sub new($$) {
$o->{vga16} = 1 if /VGA16/;
&$launchX($prog, $Driver) and goto OK;
}
- $::move and print("can not launch graphical mode :(\n"), c::_exit(1);
}
return undef;
}
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 2b26c7305..3cabc18f7 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -940,8 +940,7 @@ sub set {
put_in_hash(\%ENV, i18n_env($locale));
- if ($::move) {
- } elsif (!$::isInstall) {
+ if (!$::isInstall) {
bindtextdomain();
} else {
$ENV{LC_NUMERIC} = 'C'; #- otherwise eval "1.5" returns 1 in fr_FR
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index e8edd9e67..ab4ad22ef 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -63,7 +63,7 @@ sub load_raw {
my ($l, $h_options) = @_;
if ($::testing || $::local_install) {
log::l("i would load module $_ ($h_options->{$_})") foreach @$l;
- } elsif ($::isInstall && !$::move) {
+ } elsif ($::isInstall) {
load_raw_install($l, $h_options);
} else {
run_program::run('/sbin/modprobe', $_, split(' ', $h_options->{$_}))
generated by cgit v1.2.1 (git 2.21.0) at 2024-05-29 11:35:46 +0000