From ede63b3b0df1883f368711a6ca6746455d2a4076 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 27 Jan 2000 14:03:35 +0000 Subject: no_comment --- docs/TODO | 5 +++ perl-install/.cvsignore | 1 + perl-install/Makefile | 31 +++++++------ perl-install/Makefile.config | 1 - perl-install/do_resize_fat | 2 +- perl-install/install_steps.pm | 3 +- perl-install/install_steps_gtk.pm | 34 +++++++------- perl-install/install_steps_interactive.pm | 25 ++++++----- perl-install/keyboard.pm | 3 +- perl-install/list.sparc | 73 ------------------------------- perl-install/modules.pm | 2 +- perl-install/my_gtk.pm | 2 +- perl-install/partition_table.pm | 15 ++++--- perl-install/partition_table_raw.pm | 2 +- perl-install/share/compssList | 4 +- perl-install/share/list | 27 +++++++++++- tools/Makefile | 2 +- tools/make_mdkinst_stage2 | 14 +++--- update_kernel | 11 +++-- 19 files changed, 108 insertions(+), 149 deletions(-) delete mode 100644 perl-install/list.sparc diff --git a/docs/TODO b/docs/TODO index 79e89f1b2..2e5bcf332 100644 --- a/docs/TODO +++ b/docs/TODO @@ -53,6 +53,11 @@ fix any // in path to ftp server otherwise windobe server bug :( missing feature in lilo configuration: can't give hda2 with /boot/vmlinuz if already hda1 with /boot/vmlinuz +I have Mandrake 6.1 installed and working on a ThinkPad 770. +To enable the PCMCIA Token ring I have to append the following line to +/etc/pcmcia/config.opts +module "ibmtr_cs" opts "mmiobase=0xd2000 srambase=0xd4000" + configure DHCP for newbies if ethernet & DHCP card available > Here I go into the printer configuration select 'HP Deskjet 722C Colour', diff --git a/perl-install/.cvsignore b/perl-install/.cvsignore index 7763cfb9e..aee8791b0 100644 --- a/perl-install/.cvsignore +++ b/perl-install/.cvsignore @@ -2,3 +2,4 @@ debug.log auto_inst.cfg auto t.pm +modparm.lst diff --git a/perl-install/Makefile b/perl-install/Makefile index ddc412be3..4555835f7 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -15,7 +15,7 @@ clean: tar-drakxtools: clean $(MAKE) -C ../tools clean cd .. ; rm -rf drakxtools ; cp -af perl-install drakxtools ; cp -af tools/ddcprobe tools/pnp_serial drakxtools - cd ../drakxtools ; rm -rf install* ForMakefile.pm pkgs.pm ftp.pm t.pm standalone/CVS ; mv Makefile.drakxtools Makefile ; mv -f standalone/* . + cd ../drakxtools ; rm -rf install* pkgs.pm ftp.pm t.pm */CVS ; mv Makefile.drakxtools Makefile ; mv -f standalone/* share/* . cd .. ; tar cfy drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile Makefile.config MonitorsDB Newt c ddcprobe pnp_serial po pci_probing resize_fat diskdrake.rc $(STANDALONEPMS) icons *.pm) cd .. ; rm -rf drakxtools @@ -45,9 +45,9 @@ install_pms: $(DIRS) done # perl -pe 's/#-.*//; $$_ = "\n" if (/^=head/ .. /^=cut/) || /use (diagnostics)/' $$i > $(DESTREP4PMS)/$$i; \ - cp *.rc $(DESTREP4PMS) + cp share/*.rc $(DESTREP4PMS) install -d $(DESTREP4PMS)/po - cp -f po/*.po* $(DESTREP4PMS)/po ||: + cp -f share/po/*.po* $(DESTREP4PMS)/po ||: chmod a+x $(DESTREP4PMS)/install2 chmod a+x $(DESTREP4PMS)/commands chmod a+x $(DESTREP4PMS)/standalone/* @@ -55,8 +55,8 @@ install_pms: $(DIRS) get_needed_files: $(DIRS) # export PERL_INSTALL_TEST=1 ; strace -f -e trace=file -o '| grep -v "(No such file or directory)" | sed -e "s/[^\"]*\"//" -e "s/\".*//" | grep "^/" | grep -v -e "^/tmp" -e "^/home" -e "^/proc" -e "^/var" -e "^/dev" -e "^/etc" -e "^/usr/lib/rpm" > /tmp/list ' $(PERL) -d install2 < /dev/null - cp -f `../tools/specific_arch list` /tmp/list -# cp -f list /tmp/list + cp -f `../tools/specific_arch share/list` /tmp/list +# cp -f share/list /tmp/list # perl -pi -e "s/ARCH/$(ARCH)/" /tmp/list find auto -follow -name "*.so" >> /tmp/list @@ -109,17 +109,16 @@ endif perl -ane 'symlink "$$F[1]", "$(DEST)/usr/bin/$$F[0]"' aliases - tar xfy `../tools/specific_arch locales.tar.bz2` -C $(DEST) -# DEST=$(DEST) perl -I. -MForMakefile -e 'locale()' -# DEST=$(DEST) perl -I. -MForMakefile -e 'xmodmap()' + tar xfy `../tools/specific_arch share/locales.tar.bz2` -C $(DEST) - cp -a keymaps $(DEST)/usr/share - cp -a consolefonts $(DEST)/usr/share - cp template.in/*.in modparm.lst $(DEST)/usr/share - cp MonitorsDB $(DEST)/usr/X11R6/lib/X11 - cp logo-mandrake.xpm $(DEST)/usr/share - cp -a themes $(DEST)/usr/share/gtk - cp compss compssUsers compssList $(ROOTDEST)/Mandrake/base + cp -a modparm.lst $(DEST)/usr/share + cd share ; cp -a keymaps $(DEST)/usr/share + cd share ; cp -a consolefonts $(DEST)/usr/share + cd share ; cp template.in/*.in $(DEST)/usr/share + cd share ; cp MonitorsDB $(DEST)/usr/X11R6/lib/X11 + cd share ; cp logo-mandrake.xpm $(DEST)/usr/share + cd share ; cp -a themes $(DEST)/usr/share/gtk + cd share ; cp compss compssUsers compssList $(ROOTDEST)/Mandrake/base if [ -f "../modules/modules.cz2" ]; then \ cp -f ../modules/modules.cz2 $(DEST)/lib/; \ @@ -130,7 +129,7 @@ endif cp -f ../modules/pristine/* $(DEST)/lib/modules ||: ; \ fi -# echo -e "#!/bin/sh\n\nexec '/usr/bin/sh'" > $(DEST)/usr/bin/runinstall2 +# echo -e '#!/bin/sh\n\nexec "/usr/bin/sh"' > $(DEST)/usr/bin/runinstall2 # chmod a+x $(DEST)/usr/bin/runinstall2 tar xyC $(DEST) -f ../install/install1_pcmcia.tar.bz2 ./etc/pcmcia diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index f3055677c..de17135c8 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -13,7 +13,6 @@ DESTREP4PMS = $(DEST)$(REP4PMS) PERL = perl LOCALFILES = $(patsubst %, ../tools/%,e2fsck.shared ddcprobe/ddcxinfos pnp_serial/pnp_serial xhost+ extract_archive) 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/do_resize_fat b/perl-install/do_resize_fat index 0668ecb19..239446841 100755 --- a/perl-install/do_resize_fat +++ b/perl-install/do_resize_fat @@ -9,7 +9,7 @@ use resize_fat::main; local *log::l = sub { print join(' ', @_), "\n" }; -@ARGV = qw(/tmp/eee +0); +@ARGV = qw(/tmp/dd +0); @ARGV == 2 or die "usage: fatresize \n = 100 means `resize to 100Mb'\n = +10 means `keep 10Mb of free space'\n"; diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index f868bfeae..c8bcc2a64 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -567,12 +567,11 @@ sub createBootdisk($) { if (arch() =~ /^sparc/) { require silo; silo::mkbootdisk($o->{prefix}, install_any::kernelVersion(), $dev, $o->{bootloader}{perImageAppend}); - $o->{mkbootdisk} = $dev; } else { require lilo; lilo::mkbootdisk($o->{prefix}, install_any::kernelVersion(), $dev, $o->{bootloader}{perImageAppend}); - $o->{mkbootdisk} = $dev; } + $o->{mkbootdisk} = $dev; } #------------------------------------------------------------------------------ diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 86101f814..d82ea688a 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -181,7 +181,7 @@ sub new($$) { my $ok = 1; local $SIG{CHLD} = sub { $ok = 0 }; unless (fork) { - exec $_[0], (arch() =~ /^sparc/ ? () : ("-kb")), "-dpms","-s" ,"240", "-allowMouseOpenFail", "-xf86config", $f or exit 1; + exec $_[0], "-dpms","-s" ,"240", "-allowMouseOpenFail", "-xf86config", $f or exit 1; } foreach (1..15) { sleep 1; @@ -190,7 +190,7 @@ sub new($$) { } 0; }; - my @servers = qw(FBDev VGA16); + my @servers = qw(FBDev VGA16); #-) @servers = qw(FBDev 3DLabs TGA) if arch() eq "alpha"; @servers = qw(Mach64) if arch() =~ /^sparc/; @@ -222,8 +222,6 @@ sub new($$) { install_theme($o); create_logo_window($o); -# eval { sleep 10; run_command::run('xhost+') }; #- for testing - $my_gtk::force_center = [ $width - $windowwidth, $logoheight, $windowwidth, $windowheight ]; (bless {}, ref $type || $type)->SUPER::new($o); @@ -373,7 +371,7 @@ sub choosePackagesTree { $size += $_->{size} - ($_->{installedCumulSize} || 0) if $_->{selected}; #- on upgrade, installed packages will be removed. } - $w_size->set(_("Total size: ") . int (pkgs::correctSize($size / sqr(1024))) . " / $availableSpace " . _("MB") ); + $w_size->set(_("Total size: ") . int (pkgs::correctSize($size / sqr(1024))) . " / $availableSpace " . _("KB") ); }; my $new_item = sub { my ($p, $name, $parent) = @_; @@ -807,7 +805,7 @@ END local *F; open F, ">$file" or die "can't create X configuration file $file"; - print F <wait_message(_("PCMCIA"), _("Configuring PCMCIA cards...")) if modules::pcmcia_need_config($pcmcia); if ($type =~ /scsi/i && cat_("/proc/cmdline") !~ /ide2=/) { - log::l("HPT: looking for HPT"); require pci_probing::main; - my @l = grep { $_->[1] =~ /HPT/ } pci_probing::main::probe('STORAGE_OTHER', 'more'); - if (@l == 2 && $o->ask_yesorno('', -_("Linux does not yet fully support ultra dma 66 HPT. + my @l = map { $_->[0] } grep { $_->[1] =~ /(HPT|Ultra66)/ } pci_probing::main::probe('STORAGE_OTHER', 'more'); + if ($o->ask_yesorno('', +_("Linux does not yet fully support ultra dma 66. As a work-around i can make a custom floppy giving access the hard drive on ide2 and ide3"), 1)) { - log::l("HPT: found"); - my $ide = sprintf "ide2=0x%x,0x%x ide3=0x%x,0x%x", map { - my ($a, $b) = (split ' ', $_->[0])[3,4]; - hex($a) - 1, hex($b) + 1; - } @l; - log::l("HPT: gonna add ($ide)"); + log::l("HPT|Ultra66: found"); + my $ide = sprintf "ide2=0x%x,0x%x ide3=0x%x,0x%x", + map_index { hex($_) + (odd($::i) ? 1 : -1) } do { + if (@l == 2) { + map { (split ' ')[3..4] } @l + } else { + map { (split ' ')[3..6] } @l + } + }; + log::l("HPT|Ultra66: gonna add ($ide)"); my $dev = devices::make("fd0"); my $image = $o->{pcmcia} ? "pcmcia" : @@ -1168,7 +1171,7 @@ _("Enter a floppy to create an HTP enabled boot log::l("HTP: modifying syslinux.cfg"); substInFile { s/(?=$)/ $ide/ if /^\s*append\s/ } "/floppy/syslinux.cfg"; fs::umount("/floppy"); - log::l("HPT: all done"); + log::l("HPT|Ultra66: all done"); $o->ask_warn('', $nb_try ? _("It is necessary to restart installation booting on the floppy") : diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index a029360eb..ff0468fec 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -171,7 +171,6 @@ sub lang2keyboard($) { } sub load($) { - return if arch() =~ /^sparc/; my ($keymap) = @_; my ($magic, @keymaps) = unpack "I i" . c::MAX_NR_KEYMAPS() . "a*", $keymap; @@ -224,7 +223,7 @@ sub setup($) { eval { load() }; } my $f = xmodmap_file($keyboard); - #eval { run_program::run('xmodmap', $f) } unless $::testing || !$f; + eval { run_program::run('xmodmap', $f) } unless $::testing || !$f; } sub write($$;$) { diff --git a/perl-install/list.sparc b/perl-install/list.sparc deleted file mode 100644 index d35feefa2..000000000 --- a/perl-install/list.sparc +++ /dev/null @@ -1,73 +0,0 @@ -/bin/ash -/bin/cpio -/lib/libnss_nis.so.2 -/lib/libnss_files.so.2 -/lib/libnss_dns.so.2 -/lib/libresolv.so.2 -/etc/protocols -/sbin/fdisk -/sbin/ifport -/sbin/insmod -/sbin/mkraid -/sbin/rmmod -/sbin/mkdosfs -/sbin/mke2fs -/sbin/raidstart -/usr/bin/bzip2 -/usr/bin/perl -/usr/lib/libimlib-png.so -/usr/lib/gtk/themes/engines/libpixmap.so -/usr/lib/gtk/themes/engines/libpixmap.la -/usr/lib/libimlib-png.so -/usr/lib/perl5/5.00503/AutoLoader.pm -/usr/lib/perl5/5.00503/Carp.pm -/usr/lib/perl5/5.00503/Data/Dumper.pm -/usr/lib/perl5/5.00503/Exporter.pm -/usr/lib/perl5/5.00503/FileHandle.pm -/usr/lib/perl5/5.00503/SelectSaver.pm -/usr/lib/perl5/5.00503/SelfLoader.pm -/usr/lib/perl5/5.00503/Symbol.pm -/usr/lib/perl5/5.00503/Time/Local.pm -/usr/lib/perl5/5.00503/dumpvar.pl -/usr/lib/perl5/5.00503/sparc-linux/Config.pm -/usr/lib/perl5/5.00503/sparc-linux/DynaLoader.pm -/usr/lib/perl5/5.00503/sparc-linux/Fcntl.pm -/usr/lib/perl5/5.00503/sparc-linux/auto/Fcntl/Fcntl.bs -/usr/lib/perl5/5.00503/sparc-linux/auto/Fcntl/Fcntl.so -/usr/lib/perl5/5.00503/sparc-linux/IO/File.pm -/usr/lib/perl5/5.00503/sparc-linux/IO/Handle.pm -/usr/lib/perl5/5.00503/sparc-linux/IO/Seekable.pm -/usr/lib/perl5/5.00503/sparc-linux/IO/Socket.pm -/usr/lib/perl5/5.00503/sparc-linux/Socket.pm -/usr/lib/perl5/5.00503/sparc-linux/_h2ph_pre.ph -/usr/lib/perl5/5.00503/sparc-linux/asm/unistd.ph -/usr/lib/perl5/5.00503/sparc-linux/asm-sparc/unistd.ph -/usr/lib/perl5/5.00503/sparc-linux/asm-sparc64/unistd.ph -/usr/lib/perl5/5.00503/sparc-linux/auto/Data/Dumper/Dumper.bs -/usr/lib/perl5/5.00503/sparc-linux/auto/Data/Dumper/Dumper.so -/usr/lib/perl5/5.00503/sparc-linux/auto/IO/IO.so -/usr/lib/perl5/5.00503/sparc-linux/auto/Socket/Socket.bs -/usr/lib/perl5/5.00503/sparc-linux/auto/Socket/Socket.so -/usr/lib/perl5/5.00503/sparc-linux/bits/syscall.ph -/usr/lib/perl5/5.00503/sparc-linux/sys/syscall.ph -/usr/lib/perl5/5.00503/sparc-linux/syscall.ph -/usr/lib/perl5/5.00503/lib.pm -/usr/lib/perl5/5.00503/overload.pm -/usr/lib/perl5/5.00503/strict.pm -/usr/lib/perl5/5.00503/vars.pm -/usr/lib/perl5/site_perl/5.005/sparc-linux/Gtk.pm -/usr/lib/perl5/site_perl/5.005/sparc-linux/Gtk/Types.pm -/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/Cmd.pm -/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/Config.pm -/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/FTP.pm -/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/FTP/A.pm -/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/FTP/I.pm -/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/FTP/dataconn.pm -/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/Netrc.pm -/usr/lib/perl5/site_perl/5.005/sparc-linux/auto/Gtk/Gtk.bs -/usr/lib/perl5/site_perl/5.005/sparc-linux/auto/Gtk/Gtk.so -/usr/lib/rpm/rpmrc -/usr/X11R6/bin/XF86_FBDev -/usr/X11R6/bin/XF86_Mach64 -/usr/X11R6/bin/xmodmap -/usr/X11R6/lib/modules/xf86Wacom.so diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 4af311cc8..b561d0289 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -27,7 +27,7 @@ arch() =~ /^sparc/ ? ( "3c505" => "3com 3c505", "3c507" => "3com 3c507", "3c515" => "3com 3c515", - "3c90x" => "3com 3c90x and 3c980", + "3c90x" => "3Com 3c90x (Cyclone/Hurricane/Tornado)", "at1700" => "Allied Telesis AT1700", "ac3200" => "Ansel Communication AC3200", "acenic" => "AceNIC Gigabit Ethernet", diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index 99a7733ac..290abbe47 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -132,7 +132,7 @@ sub gtktext_insert($$) { $w->backward_delete($w->get_length); $w->insert(undef, undef, undef, "$t\n"); #- needs \n otherwise in case of one line text the beginning is not shown (even with the vadj->set_value) $w->set_word_wrap(1); - $w->vadj->set_value(0); +#- $w->vadj->set_value(0); $w->thaw; $w; } diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index 82c950349..624e616a0 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -3,6 +3,7 @@ package partition_table; use diagnostics; use strict; use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @important_types @fields2save); +use Data::Dumper; @ISA = qw(Exporter); %EXPORT_TAGS = ( @@ -16,7 +17,7 @@ use partition_table_raw; use partition_table_dos; use partition_table_bsd; use partition_table_sun; -use Data::Dumper; +use log; @important_types = ('Linux native', 'Linux swap', 'DOS FAT16', 'Win98 FAT32', 'Linux RAID'); @@ -352,18 +353,18 @@ sub read_one($$) { sub read($;$) { my ($hd, $clearall) = @_; - my $pt = $clearall ? - $hd->clear_raw : - read_one($hd, 0) || return 0; - + if ($clearall) { + partition_table_raw::zero_MBR($hd); + return 1; + } + my $pt = read_one($hd, 0) or return 0; $hd->{primary} = $pt; undef $hd->{extended}; - $clearall and return $hd->{isDirty} = $hd->{needKernelReread} = 1; verifyPrimary($pt); - eval { $pt->{extended} and read_extended($hd, $pt->{extended}) || return 0; }; die "extended partition: $@" if $@; + assign_device_numbers($hd); remove_empty_extended($hd); 1; diff --git a/perl-install/partition_table_raw.pm b/perl-install/partition_table_raw.pm index 668913d9c..455381935 100644 --- a/perl-install/partition_table_raw.pm +++ b/perl-install/partition_table_raw.pm @@ -79,7 +79,7 @@ sub kernel_read($) { sub zero_MBR($) { my ($hd) = @_; # unless (ref($hd) =~ /partition_table/) { - my $type = arch() eq "alpha" ? "bsd" : arch() =~ /^sparc/ ? "sun" : "dos"; + my $type = arch() eq "alpha" ? "bsd" : arch() =~ /^sparc/ ? "sun" : "sun"; bless $hd, "partition_table_$type"; # } $hd->{isDirty} = $hd->{needKernelReread} = 1; diff --git a/perl-install/share/compssList b/perl-install/share/compssList index daa3468b0..1263203b1 100644 --- a/perl-install/share/compssList +++ b/perl-install/share/compssList @@ -801,7 +801,7 @@ rxvt 49 0 96 rxvt-CLE -10 -90 -10 sag 39 35 25 samba 28 99 30 -samba-client 5 2 5 +samba-client 35 56 30 samba-common 0 0 0 sane 45 0 53 sane-devel 10 0 2 @@ -942,7 +942,7 @@ xemacs 57 0 0 xemacs-X11 59 0 80 xemacs-extras 50 0 36 xemacs-info 54 0 42 -xemacs-mule 27 0 13 +xemacs-mule 0 0 0 xfce 54 0 34 xfig 59 0 53 xfishtank 51 0 45 diff --git a/perl-install/share/list b/perl-install/share/list index 60952d68d..d7e8b49b3 100644 --- a/perl-install/share/list +++ b/perl-install/share/list @@ -15,7 +15,32 @@ /sbin/raidstart /usr/bin/bzip2 /usr/bin/perl -/usr/lib/libimlib-png.so +/usr/lib/gconv/BIG5.so +/usr/lib/gconv/EUC-JP.so +/usr/lib/gconv/libGB.so +/usr/lib/gconv/libKSC.so +/usr/lib/gconv/EUC-KR.so +/usr/lib/gconv/ISO8859-15.so +/usr/lib/gconv/ISO8859-10.so +/usr/lib/gconv/ISO8859-13.so +/usr/lib/gconv/ISO8859-14.so +/usr/lib/gconv/ISO8859-4.so +/usr/lib/gconv/ISO8859-5.so +/usr/lib/gconv/ISO8859-7.so +/usr/lib/gconv/ISO8859-8.so +/usr/lib/gconv/ISO8859-9.so +/usr/lib/gconv/ISO8859-2.so +/usr/lib/gconv/ISO8859-3.so +/usr/lib/gconv/KOI8-U.so +/usr/lib/gconv/TIS-620.so +/usr/lib/gconv/ARMSCII-8.so +/usr/lib/gconv/CP1251.so +/usr/lib/gconv/VISCII.so +/usr/lib/gconv/TCVN-5712.so +/usr/lib/gconv/GEORGIAN-ACADEMY.so +/usr/lib/gconv/GEORGIAN-PS.so +/usr/lib/gconv/EUC-CN.so +/usr/lib/gconv/ISO8859-6.so /usr/lib/gtk/themes/engines/libpixmap.so /usr/lib/gtk/themes/engines/libpixmap.la /usr/lib/libimlib-png.so diff --git a/tools/Makefile b/tools/Makefile index cfc861723..cf75c866c 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -38,4 +38,4 @@ $(BASE)/hdlist: $(RPMS) clean: for i in $(DIRS); do $(MAKE) -C $$i clean; done - rm -rf *~ gendepslist rpm2header ddcprobe/ddcxinfos */*.o + rm -rf *~ gendepslist xhost+ rpm2header ddcprobe/ddcxinfos */*.o diff --git a/tools/make_mdkinst_stage2 b/tools/make_mdkinst_stage2 index 7652317be..b68826fba 100755 --- a/tools/make_mdkinst_stage2 +++ b/tools/make_mdkinst_stage2 @@ -29,12 +29,6 @@ $SUDO rm -rf $STAGE2TMP install -d $STAGE2TMP $SUDO cp -a $DEST/* $STAGE2TMP -mkdir -p $MNTPOINT 2>/dev/null -for i in $MNTPOINT $STAGE2; do $SUDO umount $i 2>/dev/null ; done -dd if=/dev/zero of=$STAGE2 bs=1k count=18000 -$MKE2FS -N 1000 $STAGE2 -$SUDO mount -t ext2 $STAGE2 $MNTPOINT -o loop - # hack to reduce the STAGE2 image (do not edit without modifying in DrakX) rm -f $STAGE2TMP/usr/X11R6/bin/XF86_VGA16 rm -f $STAGE2TMP/$REP4PMS/po/DrakX.pot @@ -47,7 +41,15 @@ for i in /usr/share/keymaps /usr/share/xmodmap $REP4PMS/po; do (cd $STAGE2TMP/$i ; ls * | $BUILD_ARCHIVE ../$name 400000) rm -rf $STAGE2TMP/$i done + + +mkdir -p $MNTPOINT 2>/dev/null +for i in $MNTPOINT $STAGE2; do $SUDO umount $i 2>/dev/null ; done +dd if=/dev/zero of=$STAGE2 bs=1k count=$[ `du -s $STAGE2TMP | cut -f1` + 1024 ] +$MKE2FS -N 1000 $STAGE2 +$SUDO mount -t ext2 $STAGE2 $MNTPOINT -o loop + $SUDO cp -a $STAGE2TMP/* $MNTPOINT $SUDO rm -rf $STAGE2TMP diff --git a/update_kernel b/update_kernel index fea5ab078..c57b77a50 100755 --- a/update_kernel +++ b/update_kernel @@ -11,13 +11,12 @@ f "net" ; NETWORK_DRIVERS=$v f "scsi|cdrom" ; CD_DRIVERS=$v f "pcmcia" ; PCMCIA_DRIVERS=$v -MISCMODULES="lp.o parport_pc.o parport.o loop.o" FSMODULES="vfat.o fat.o" -NETWORK_MODULES="$MISCMODULES $FSMODULES $NETWORK_DRIVERS" +NETWORK_MODULES="$FSMODULES $NETWORK_DRIVERS" CDROM_MODULES=" $FSMODULES $CD_DRIVERS" -HD_MODULES=" $MISCMODULES $FSMODULES $SCSI_DRIVERS" -PCMCIA_MODULES=" $MISCMODULES $FSMODULES $PCMCIA_DRIVERS 8390.o lockd.o nfs.o sunrpc.o isofs.o" +HD_MODULES=" $FSMODULES $SCSI_DRIVERS" +PCMCIA_MODULES=" $FSMODULES $PCMCIA_DRIVERS 8390.o lockd.o nfs.o sunrpc.o isofs.o" LNX4WIN_MODULES="$FSMODULES loop.o isofs.o" NOT_USEFULL_IN_STAGE1="nls_*.o parport_probe.o raid*.o serial.o smbfs.o usb-*.o" @@ -25,8 +24,8 @@ echo $NETWORK_DRIVERS PCMCIA_INSTALLMODULES="pcmcia_core.o tcic.o ds.o i82365.o" -cp -f "$KERNEL_BOOT_PATH"/boot/vmlinuz* vmlinuz -cp -f "$KERNEL_BOOT_PATH"/boot/System.map* System.map +cp -f $KERNEL_BOOT_PATH/boot/vmlinuz* vmlinuz +cp -f $KERNEL_BOOT_PATH/boot/System.map* System.map #set 640x480x16 resolution on boot. /usr/sbin/rdev -v vmlinuz 785 -- cgit v1.2.1