summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/common.pm2
-rw-r--r--perl-install/diskdrake/interactive.pm2
-rw-r--r--perl-install/fs.pm2
-rw-r--r--perl-install/install2.pm18
-rw-r--r--perl-install/install_any.pm49
-rw-r--r--perl-install/install_steps_interactive.pm12
-rw-r--r--perl-install/lang.pm29
-rw-r--r--perl-install/pkgs.pm7
-rw-r--r--perl-install/run_program.pm4
9 files changed, 3 insertions, 122 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm
index f635cd9f2..d016c6a23 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -146,8 +146,6 @@ sub formatTime {
}
}
-sub usingRamdisk() { any { /ram3/ } cat_("/proc/mounts") }
-
sub expand_symlinks_but_simple {
my ($f) = @_;
my $link = readlink($f);
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 3cc33dd90..2a440a4d4 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -419,7 +419,7 @@ sub part_possible_actions {
$part or return;
my %actions = my @l = (
- N_("Mount point") => '($part->{real_mntpoint} && common::usingRamdisk()) || (!isBusy && !isSwap && !isNonMountable)',
+ N_("Mount point") => '$part->{real_mntpoint} || (!isBusy && !isSwap && !isNonMountable)',
N_("Type") => '!isBusy && $::expert && (!readonly || $part->{pt_type} == 0x83)',
N_("Options") => '$::expert',
N_("Resize") => '!isBusy && !readonly && !isSpecial || isLVM($hd) && isMounted && $part->{fs_type} eq "xfs"',
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 9bf2261d8..abc66c540 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -216,7 +216,7 @@ sub merge_info_from_mtab {
$_->{real_mntpoint} = delete $_->{mntpoint};
if ($_->{real_mntpoint} eq '/tmp/hdimage') {
log::l("found hdimage on $_->{device}");
- $_->{mntpoint} = common::usingRamdisk() && "/mnt/hd"; #- remap for hd install.
+ $_->{mntpoint} = "/mnt/hd"; #- remap for hd install.
}
}
$_->{isMounted} = 1;
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 507c56af0..4bcc0e656 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -549,22 +549,6 @@ sub main {
#- need to be after oo-izing $o
if ($o->{brltty}) {
symlink "/tmp/stage2/$_", $_ foreach "/etc/brltty";
- if (common::usingRamdisk()) {
- install_any::remove_unused(0);
- mkdir '/tmp/stage2/etc/brltty';
- mkdir '/lib/brltty';
- foreach ($o->{brltty}{table}, "brltty-$o->{brltty}{driver}.hlp") {
- install_any::getAndSaveFile("/etc/brltty/$_") if $_;
- }
- install_any::getAndSaveFile("/lib/brltty/libbrlttyb$o->{brltty}{driver}.so") or do {
- local $| = 1;
- print("Braille driver $o->{brltty}{driver} for BRLTTY was not found.\n",
- "Press ENTER to continue.\n\a");
- <STDIN>;
- };
- install_any::getAndSaveFile("/usr/bin/brltty");
- chmod 0755, "/usr/bin/brltty";
- }
eval { modules::load("serial") };
devices::make($_) foreach $o->{brltty}{device} ? $o->{brltty}{device} : qw(ttyS0 ttyS1);
devices::make("vcsa");
@@ -628,8 +612,6 @@ sub main {
}
$::o = $o = $o_;
- install_any::remove_unused() if common::usingRamdisk();
-
#-the main cycle
my $clicked = 0;
MAIN: for ($o->{step} = $o->{steps}{first};; $o->{step} = getNextStep($o)) {
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index fec69884c..bc198bacf 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1510,55 +1510,6 @@ sub write_fstab {
fs::write_fstab($o->{all_hds}, $o->{prefix}) if !$o->{isUpgrade} || $o->{migrate_device_names};
}
-my @bigseldom_used_groups = (
-);
-
-sub check_prog {
- my ($f) = @_;
-
- return if $f =~ m|^/| ? -x $f : whereis_binary($f);
-
- common::usingRamdisk() or log::l("ERROR: check_prog can't find the program $f and we're not using ramdisk"), return;
-
- my ($f_) = map { m|^/| ? $_ : "/usr/bin/$_" } $f;
- remove_bigseldom_used();
- foreach (@bigseldom_used_groups) {
- my (@l) = map { m|^/| ? $_ : "/usr/bin/$_" } @$_;
- if (member($f_, @l)) {
- foreach (@l) {
- getAndSaveFile($_);
- chmod 0755, $_;
- }
- return;
- }
- }
- getAndSaveFile($f_);
- chmod 0755, $f_;
-}
-
-sub remove_unused {
- $::testing and return;
- if (@_ ? $_[0] : $::o->isa('interactive::gtk')) {
- unlink glob_("/lib/lib$_*") foreach qw(slang newt);
- unlink "/usr/bin/perl-install/auto/Newt/Newt.so";
- } else {
- unlink glob_("/usr/X11R6/bin/XF*");
- }
-}
-
-sub remove_bigseldom_used() {
- log::l("remove_bigseldom_used");
- $::testing and return;
- remove_unused();
- unlink "/usr/X11R6/lib/modules/xf86Wacom.so";
- unlink glob_("/usr/share/gtk/themes/$_*") foreach qw(marble3d);
- unlink(m|^/| ? $_ : "/usr/bin/$_") foreach
- (map { @$_ } @bigseldom_used_groups),
- qw(lvm2),
- qw(mkreiserfs resize_reiserfs mkfs.xfs fsck.jfs);
-}
-
-
#-###############################################################################
#- pcmcia various
#-###############################################################################
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 10f8695a8..ddb61d568 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -275,7 +275,7 @@ sub ask_mntpoint_s { #- }{}
not_edit => 0,
list => [ '', fsedit::suggestions_mntpoint(fs::get::empty_all_hds()) ],
};
- } grep { !$_->{real_mntpoint} || common::usingRamdisk() } @fstab ]) or return;
+ } @fstab ]) or return;
}
$o->SUPER::ask_mntpoint_s($fstab);
}
@@ -671,16 +671,6 @@ sub chooseCD {
my @mediumsDescr;
my %mediumsDescr;
- if (!common::usingRamdisk()) {
- #- mono-cd in case of no ramdisk
- foreach (@mediums) {
- pkgs::mediumDescr($packages, $install_any::boot_medium) eq pkgs::mediumDescr($packages, $_) and next;
- undef $packages->{mediums}{$_}{selected};
- }
- log::l("low memory install, using single CD installation (as it is not ejectable)");
- return;
- }
-
#- the boot medium is already selected.
$mediumsDescr{pkgs::mediumDescr($packages, $install_any::boot_medium)} = 1;
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 0c5de9bdf..134b2ce4c 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -858,25 +858,6 @@ sub l2pango_font {
my $charset = l2charset($lang) or log::l("no charset found for lang $lang!"), return;
my $font = charset2pango_font($charset);
log::l("lang:$lang charset:$charset font:$font sfm:$charsets{$charset}[0]");
-
- if (common::usingRamdisk()) {
- if ($charsets{$charset}[0] !~ /lat|koi|UniCyr/) {
- install_any::remove_bigseldom_used();
- unlink glob_('/usr/share/langs/*'); #- remove langs images
- my @generic_fontfiles = qw(/usr/X11R6/lib/X11/fonts/12x13mdk.pcf.gz /usr/X11R6/lib/X11/fonts/18x18mdk.pcf.gz);
- #- need to unlink first because the files actually exist (and are void); they must exist
- #- because if not, when gtk starts, pango will recompute its cache file and exclude them
- unlink($_), install_any::getAndSaveFile($_) foreach @generic_fontfiles;
- }
-
- my %pango_modules = (arabic => 'ar|fa|ur', hangul => 'ko', hebrew => 'he|yi', indic => 'hi|bn|ta|te|mr', thai => 'th');
- foreach my $module (keys %pango_modules) {
- next if $lang !~ /$pango_modules{$module}/;
- install_any::remove_bigseldom_used();
- my ($pango_modules_dir) = glob('/usr/lib/pango/*/modules');
- install_any::getAndSaveFile("$pango_modules_dir/pango-$module-xft.so");
- }
- }
return $font;
}
@@ -1184,16 +1165,6 @@ sub load_mo {
-s $_->{mofile} and return $_->{name} foreach @possible_langs;
- if ($::isInstall && common::usingRamdisk()) {
- foreach (@possible_langs) {
- #- cleanup
- eval { rm_rf($localedir) };
- eval { mkdir_p(dirname($_->{mofile})) };
-
- install_any::getAndSaveFile($_->{mofile});
- -s $_->{mofile} and return $_->{name};
- }
- }
'';
}
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index af8070597..90affb556 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -498,13 +498,6 @@ sub psUsingHdlist {
#- integrate medium in media list, only here to avoid download error (update) to be propagated.
$packages->{mediums}{$medium_name} = $m;
- #- avoid using more than one medium if Cd is not ejectable.
- #- but keep all medium here so that urpmi has the whole set.
- $m->{ignored} ||= (
- install_any::method_allows_medium_change($method) && $medium_name > 1 #- first cdrom
- && $medium_name !~ /^\d+s/ #- not a suppl. CD
- && !common::usingRamdisk());
-
#- parse synthesis (if available) of directly hdlist (with packing).
if ($m->{ignored}) {
log::l("ignoring packages in $hdlist");
diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm
index c62abcb07..cb2ea8eb8 100644
--- a/perl-install/run_program.pm
+++ b/perl-install/run_program.pm
@@ -52,10 +52,6 @@ sub raw {
return 1 if $root && $<;
$root ? ($root .= '/') : ($root = '');
- if (!$root && !$::isStandalone) {
- require install_any;
- install_any::check_prog($real_name) if $real_name !~ /\|/;
- }
$ENV{HOME} || $::isInstall or $ENV{HOME} = '/root';
my $tmpdir = sub {
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-09 01:18:23 +0000