From fd6b89e3d9cb165829a25cd196b5340104a4e440 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 5 Jan 2000 20:55:20 +0000 Subject: no_comment --- perl-install/Makefile.config | 2 +- perl-install/Xconfigurator.pm | 3 ++- perl-install/fs.pm | 6 +++--- perl-install/install2.pm | 4 +++- perl-install/install_any.pm | 4 +++- perl-install/install_steps.pm | 2 +- perl-install/install_steps_interactive.pm | 3 +++ perl-install/modules.pm | 10 +++++----- perl-install/share/compssList | 6 +++--- 9 files changed, 24 insertions(+), 16 deletions(-) (limited to 'perl-install') diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 225d82895..01350b363 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -12,7 +12,7 @@ BASE = $(ROOTDEST)/Mandrake/base DESTREP4PMS = $(DEST)$(REP4PMS) PERL = perl LOCALFILES = $(patsubst %, ../tools/%,e2fsck.shared ddcprobe/ddcxinfos pnp_serial/pnp_serial xhost+ extract_archive) -DIRS = c Newt po pci_probing resize_fat +DIRS = c Newt pci_probing resize_fat #po EXCLUDE = $(LOCALFILES) boot.img keymaps consolefonts install CFLAGS = -Wall override CFLAGS += -pipe diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 44721b4ea..733fc9de9 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -318,10 +318,11 @@ sub testFinalConfig($;$$) { local $_; local *F; open F, $f_err; - while () { + i: while () { if (/\b(error|not supported)\b/i) { my @msg = !/error/ && $_ ; while () { + /not fatal/ and last i; /^$/ and last; push @msg, $_; } diff --git a/perl-install/fs.pm b/perl-install/fs.pm index 20cbf3798..5493d3dbe 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -164,12 +164,12 @@ sub umount_part($;$) { $part->{isMounted} = 0; } -sub mount_all($;$) { - my ($fstab, $prefix) = @_; +sub mount_all($;$$) { + my ($fstab, $prefix, $hd_dev) = @_; #- hd_dev is the device used for hd install log::l("mounting all filesystems"); - my ($hd_dev) = cat_("/proc/mounts") =~ m|/tmp/(\S+)\s+/tmp/hdimage| unless $::isStandalone; + $hd_dev ||= cat_("/proc/mounts") =~ m|/tmp/(\S+)\s+/tmp/hdimage| unless $::isStandalone; #- order mount by alphabetical ordre, that way / < /home < /home/httpd... foreach (grep { $_->{mntpoint} } sort { ($a->{mntpoint} || '') cmp ($b->{mntpoint} || '') } @$fstab) { diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 8c5a0c085..464024e68 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -284,6 +284,8 @@ sub partitionDisks { ] if $o->{lnx4win}; return if $o->{isUpgrade}; + ($o->{hd_dev}) = cat_("/proc/mounts") =~ m|/tmp/(\S+)\s+/tmp/hdimage|; + $::o->{steps}{formatPartitions}{done} = 0; eval { fs::umount_all($o->{fstab}, $o->{prefix}) } if $o->{fstab} && !$::testing; @@ -323,7 +325,7 @@ sub formatPartitions { $o->formatPartitions(@{$o->{fstab}}); fs::mount_all([ grep { isSwap($_) } @{$o->{fstab}} ], $o->{prefix}); die _("Not enough swap to fulfill installation, please add some") if availableMemory < 40 * 1024; - fs::mount_all([ grep { isExt2($_) } @{$o->{fstab}} ], $o->{prefix}); + fs::mount_all([ grep { isExt2($_) } @{$o->{fstab}} ], $o->{prefix}, $o->{hd_dev}); } eval { $o = $::o = install_any::loadO($o) } if $_[1] == 1; diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 36d6b2eca..12e080d57 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -131,6 +131,7 @@ sub setPackages($) { push @{$o->{default_packages}}, "kernel-pcmcia-cs" if $o->{pcmcia}; push @{$o->{default_packages}}, "apmd" if $o->{pcmcia}; push @{$o->{default_packages}}, "raidtools" if $o->{raid} && !is_empty_array_ref($o->{raid}{raid}); + push @{$o->{default_packages}}, "cdrecord" if detect_devices::getIDEBurners(); pkgs::getDeps($o->{packages}); @@ -543,6 +544,7 @@ sub template2userfile($$$$%) { if (-d dirname($outputfile) && ($force || ! -e $outputfile)) { log::l("generating $outputfile from template $inputfile"); template2file($inputfile, $outputfile, %toreplace); + m|/home/(.*)| and commands::chown_($1, $outputfile); } } } @@ -643,7 +645,7 @@ sub kdeicons_postinstall($) { } my @l = map { "$prefix$_/Desktop/Doc.kdelnk" } list_skels(); - if (my ($lang) = all("$prefix/usr/doc/mandrake")) { + if (my ($lang) = eval { all("$prefix/usr/doc/mandrake") }) { substInFile { s|^(URL=.*?)/?$|$1/$lang| } @l; } else { unlink @l; diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 7e782dc18..b7d31f6a4 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -269,7 +269,7 @@ sub afterInstallPackages($) { substInFile { s/^(UserView)=false/$1=true/ } "$o->{prefix}/usr/share/config/kdmrc" if $o->{security} < 3; run_program::rooted($o->{prefix}, "kdeDesktopCleanup"); - foreach ("/etc/skel", "/root", install_any::list_home()) { + foreach (install_any::list_skels()) { my $found; substInFile { $found ||= /KFM Misc Defaults/; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 1759aab95..8807e0a6a 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -249,6 +249,8 @@ sub choosePackages { delete $_->{unskip}; } pkgs::unselect_all($packages); + pkgs::select($o->{packages}, $o->{packages}{$_} || next) foreach @{$o->{default_packages}}; + pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $::expert ? 90 : 80, $available, $o->{installClass}); my $min_size = pkgs::size_selected($packages); @@ -506,6 +508,7 @@ pursuant to a court decision) arising out of use, possession, or the sole downloading of these software, to which customer and/or end user could eventually have access after having sign up the present agreement. + For any queries relating to these agreement, please contact Mandrakesoft, Inc. 2400 N. Lincoln Avenue Suite 243 diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 5102e589c..4aa8a0693 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -421,14 +421,14 @@ sub write_conf { while (my ($k, $v) = each %net) { add_alias($k, $v) } add_alias('scsi_hostadapter', 'ide-scsi') if detect_devices::getIDEBurners(); - $conf{supermount}{"post-install"} = - join " ; ", - map { "modprobe $_" } - grep { $conf{$_}{alias} && $conf{$_}{alias} =~ /scsi_hostadapter/ } keys %conf; + + if (my @scsis = grep { $conf{$_}{alias} && /scsi_hostadapter/ } keys %conf) { + log::l("has scsis ", join " ; ", map { "modprobe $_" } @scsis); + $conf{supermount}{"post-install"} = join " ; ", map { "modprobe $_" } @scsis; + } local *F; open F, ">> $file" or die("cannot write module config file $file: $!\n"); - while (my ($mod, $h) = each %conf) { while (my ($type, $v2) = each %$h) { print F "$type $mod $v2\n" if $v2 && $type ne "loaded" && !$written->{$mod}{$type}; diff --git a/perl-install/share/compssList b/perl-install/share/compssList index 3cc694121..db9211039 100644 --- a/perl-install/share/compssList +++ b/perl-install/share/compssList @@ -2,7 +2,7 @@ packages -acon 24 24 24 +acon 0 0 0 adjtimex 22 35 87 AfterStep 55 35 53 AfterStep-APPS 58 30 55 @@ -654,7 +654,7 @@ transfig 16 0 14 tree 40 0 10 trn 46 0 41 trojka 54 0 48 -ttfonts 57 0 51 +ttfonts 88 0 81 tunelp 24 0 28 ucd-snmp 0 70 45 ucd-snmp-devel 0 25 45 @@ -719,7 +719,7 @@ xemacs-info 54 0 42 xemacs-mule 27 0 13 xemacs-noX 28 0 12 xemacs-static 20 0 2 -xemacs-X11 59 0 54 +xemacs-X11 59 0 69 xfce 54 0 34 xfig 59 0 53 xfishtank 51 0 45 -- cgit v1.2.1