From fd6b89e3d9cb165829a25cd196b5340104a4e440 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 5 Jan 2000 20:55:20 +0000 Subject: no_comment --- .cvsignore | 1 + Makefile | 16 ++++++++++-- docs/TODO | 42 ++++++++++++++++++------------- make_boot_img | 11 +++----- 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 ++--- 13 files changed, 67 insertions(+), 43 deletions(-) diff --git a/.cvsignore b/.cvsignore index f3873caf7..3b7e3d074 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,6 +2,7 @@ kernel pictures docs *.img +*.rdz modules vmlinuz install_pcmcia_modules diff --git a/Makefile b/Makefile index ba0a3e65c..c1bdad792 100644 --- a/Makefile +++ b/Makefile @@ -1,22 +1,34 @@ BOOT_IMG = hd.img cdrom.img network.img network_ks.img pcmcia.img pcmcia_ks.img +BOOT_RDZ = hd.rdz cdrom.rdz network.rdz pcmcia.rdz BINS = install/install install/full-install install/local-install install/installinit/init DIRS = tools install install/installinit perl-install lnx4win ROOTDEST = /export +AUTOBOOT = $(ROOTDEST)/dosutils/autoboot/mdkinst .PHONY: dirs $(FLOPPY_IMG) -install: build +install: build autoboot for i in images misc Mandrake Mandrake/base; do install -d $(ROOTDEST)/$$i ; done cp -f $(BOOT_IMG) $(ROOTDEST)/images ; rm $(ROOTDEST)/images/*_ks.img make -C perl-install full_stage2 build: $(BOOT_IMG) +autoboot: + install -d $(AUTOBOOT) + cp -f hd.rdz $(AUTOBOOT)/initrd.hd + cp -f cdrom.rdz $(AUTOBOOT)/initrd.cd + cp -f pcmcia.rdz $(AUTOBOOT)/initrd.pc + cp -f network.rdz $(AUTOBOOT)/initrd.nt + dirs: for i in $(DIRS); do make -C $$i; done -$(BOOT_IMG): dirs modules +$(BOOT_RDZ): dirs modules + ./make_boot_img $@ $(@:%.rdz=%) + +$(BOOT_IMG): %.img: %.rdz ./make_boot_img $@ $(@:%.img=%) tar: clean diff --git a/docs/TODO b/docs/TODO index 942c84ccc..f149e0391 100644 --- a/docs/TODO +++ b/docs/TODO @@ -1,20 +1,11 @@ -with 2MB of video ram, chooses 8bpp instead of 16bpp - -the XFdrake test does not handle the fontset - -when you set the kde icons to Large, maybe it'd be good to chown the .kderc +(done,pix) zip with automount -> ppa not autoloaded +(done,pix)when you set the kde icons to Large, maybe it'd be good to chown the .kderc +(done,pix)lilo in russian/japaneese is horrible +(ok,pix)test ide burners test check bad blocks optional for mke2fs -test ide burners (do not work with axalon) - -hd install: no umount is done at the end of install :( - -bug: zip with automount -> ppa not autoloaded - -remount ro before X test. - -rpmdrake and same name packages +(done,pix)hd install: no umount is done at the end of install :( just before release: - mandrake_doc-xx, the symlink is no good in /usr/doc/mandrake as @@ -22,13 +13,28 @@ just before release: - update kudzu's pcitable - update pcitable for 86C368 if 3.3.6 (and other S3 3D's) +remount ro before X test. + + +-------------------------------------------------------------------------------- +rpmdrake and same name packages + +(workaround)with 2MB of video ram, chooses 8bpp instead of 16bpp + +the XFdrake test does not handle the fontset + -------------------------------------------------------------------------------- mandrake_desk has not installed while kdebase it there on upgrade -bug (by dadou): Si la partition racine est trop petite pour installer le système, un +(done,pix)bug (by dadou): Si la partition racine est trop petite pour installer le système, un message d'erreur apparaît pour signaler le problème (bien) mais on ne peut en sortir. La seule solution est de redémarrer. +Je viens de faire une installation sur une machine où seul Be était +installé. Je l'ai supprimé et installé (mode recommandé) Oxygen. Au +redémarrage, le boot manager de Be apparaît et il est impossible de +démarrer Linux. +Pourquoi ne pas installer LILO si on supprime toutes les partitions ? > Here I go into the printer configuration select 'HP Deskjet 722C Colour', > print a test ASCII page, pressing 'No' when prompted to indicate the page did @@ -54,9 +60,9 @@ bug in kde desktop if keeps home but not an upgrade bug in users: mandrake user is added twice in strange installs (mixed of security 0 + ???) -bug when selecting compssUsers, do not deselect after (if u deselect) +(obsolete)bug when selecting compssUsers, do not deselect after (if u deselect) -in ftp install, bug with X server install with wu-ftpd 2.6 (see http://www.wu-ftpd.org/broken-clients.html) +(done,fpons)in ftp install, bug with X server install with wu-ftpd 2.6 (see http://www.wu-ftpd.org/broken-clients.html) bug rpmdrake: just after installing a package, switch to `Installed', the package has wrong name @@ -79,7 +85,7 @@ bug keyboard focus: after switch in console at Xconfig step rpmdrake proposition for cdrom labels -detect ide burners and then add hdX=ide-scsi to kernel cmdline +(done,pix)detect ide burners and then add hdX=ide-scsi to kernel cmdline bug in upgrade: install from hda1:/usr/local/blah with hda1:/ diff --git a/make_boot_img b/make_boot_img index ceed9091f..c6f5431bf 100755 --- a/make_boot_img +++ b/make_boot_img @@ -14,7 +14,6 @@ if ($>) { $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; } - $install = $ {{ pcmcia => "full-install", network => "install", @@ -22,10 +21,8 @@ $install = $ {{ hd => "local-install" }}{$type} or die; -$0 =~ /initrd/ ? - initrd($mnt, $img) : - msg_boot_img($mnt, $img); - #boot_img($mnt, $img); +$img =~ /rdz$/ ? initrd($mnt, $img) : msg_boot_img($mnt, $img); +#boot_img($mnt, $img); sub __ { print @_, "\n"; system(@_); } sub _ { __ @_; $? and die; } @@ -67,7 +64,7 @@ sub boot_img { _ "bunzip2 -c $instdir/installinit/emptyboot.img.bz2 > $img"; _ "$sudo mount -t msdos -o umask=0 $img $mnt -o loop"; _ "cat vmlinuz > $mnt/vmlinuz"; - initrd("${mnt}2", "$mnt/$type.rdz"); + -f "$type.rdz" ? _ "cp -f $type.rdz $mnt" : initrd("${mnt}2", "$mnt/$type.rdz"); output("$mnt/syslinux.cfg", " default linux @@ -92,7 +89,7 @@ sub msg_boot_img { } _ "$sudo mount -t msdos -o umask=0 $img $mnt -o loop"; _ "cat vmlinuz > $mnt/vmlinuz"; - initrd("${mnt}2", "$mnt/$type.rdz"); + -f "$type.rdz" ? _ "cp -f $type.rdz $mnt" : initrd("${mnt}2", "$mnt/$type.rdz"); my $timeout = $ks ? 1 : 72; my $setmode = !($type eq 'hd') && "mode 0x101\n"; 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