diff options
| -rw-r--r-- | perl-install/bootloader.pm | 14 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 6 | ||||
| -rw-r--r-- | perl-install/fs/mount.pm | 2 | ||||
| -rw-r--r-- | perl-install/services.pm | 2 |
4 files changed, 5 insertions, 19 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 41b77b5b3..02de18bb8 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -713,10 +713,6 @@ sub add_kernel { #- perImageAppend contains resume=/dev/xxx which we don't want @$dict = grep { $_->[0] ne 'resume' } @$dict; } - if (-e "$::prefix/sbin/udev" && any::cmp_kernel_versions($kernel_str->{version_no_ext}, '2.6.8') >= 0) { - log::l("it is a recent kernel, so we remove any existing devfs= kernel option to enable udev"); - @$dict = grep { $_->[0] ne 'devfs' } @$dict; - } $v->{append} = pack_append($simple, $dict); } @@ -900,23 +896,17 @@ sub get_kernels_and_labels_before_kernel_remove { } sub get_kernels_and_labels { - my ($b_prefer_24) = @_; - get_kernel_labels([ installed_vmlinuz() ], $b_prefer_24); + get_kernel_labels([ installed_vmlinuz() ]); } sub get_kernel_labels { - my ($kernels, $b_prefer_24) = @_; + my ($kernels) = @_; my @kernels_str = sort { any::cmp_kernel_versions($b->{version_no_ext}, $a->{version_no_ext}) } grep { -d "$::prefix/lib/modules/$_->{version}" } map { vmlinuz2kernel_str($_) } @$kernels; - if ($b_prefer_24) { - my ($kernel_24, $other) = partition { $_->{ext} eq '' && $_->{version} =~ /^\Q2.4/ } @kernels_str; - @kernels_str = (@$kernel_24, @$other); - } - my %labels; foreach (@kernels_str) { if ($labels{$_->{ext}}) { diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index b9eaa932a..2d3c2fd5c 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -342,9 +342,7 @@ sub getCompaqSmartArray() { my (@idi, $f); foreach ('array/ida', 'cpqarray/ida', 'cciss/cciss') { - my $prefix = "/proc/driver/$_"; #- kernel 2.4 places it here - $prefix = "/proc/$_" if !-e "${prefix}0"; #- kernel 2.2 - + my $prefix = "/proc/driver/$_"; my ($name) = m|/(.*)|; for (my $i = 0; -r ($f = "${prefix}$i"); $i++) { my @raw_devices = cat_($f) =~ m|^\s*($name/.*?):|gm; @@ -1066,7 +1064,7 @@ sub hasSMP() { (any { /^processor\s*:\s*(\d+)/ && $1 > 0 } cat_('/proc/cpuinfo')) || any { /\bProcessor #(\d+)\s+(\S*)/ && $1 > 0 && $2 ne 'invalid' } syslog(); } -sub hasPCMCIA() { $::o->{pcmcia} } #- because /proc/pcmcia seems not to be present on 2.4 at least (or use /var/run/stab) +sub hasPCMCIA() { $::o->{pcmcia} } my (@dmis, $dmidecode_already_runned); diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm index f2e9eac40..4365c0caa 100644 --- a/perl-install/fs/mount.pm +++ b/perl-install/fs/mount.pm @@ -36,7 +36,7 @@ sub mount { { my @fs_modules = qw(btrfs ext3 ext4 hfs jfs nilfs2 nfs ntfs romfs reiserfs ufs xfs vfat); - my @types = (qw(ext2 proc sysfs usbfs usbdevfs iso9660 devfs devpts auto ntfs-3g), @fs_modules); + my @types = (qw(ext2 proc sysfs usbfs usbdevfs iso9660 devpts auto ntfs-3g), @fs_modules); push @types, 'smb', 'cifs', 'davfs2' if !$::isInstall; diff --git a/perl-install/services.pm b/perl-install/services.pm index 9a8bccdfb..512f7eb3a 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -49,8 +49,6 @@ many services, including telnet, ftp, rsh, and rlogin. Disabling inetd disables all of the services it is responsible for."), ip6tables => N_("Automates a packet filtering firewall with ip6tables"), iptables => N_("Automates a packet filtering firewall with iptables"), -ipchains => N_("Launch packet filtering for Linux kernel 2.2 series, to set -up a firewall to protect your machine from network attacks."), irqbalance => N_("Evenly distributes IRQ load across multiple CPUs for enhanced performance"), keytable => N_("This package loads the selected keyboard map as set in /etc/sysconfig/keyboard. This can be selected using the kbdconfig utility. |