summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-01-29 19:11:23 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-01-29 19:11:23 +0000
commit1556b35a2faca162736df1158e2119c362b02fd2 (patch)
tree167e16f6a5ced6ed144790b9aa8abc3c89f00cae
parentadf525fea76f398585d56bde6f481826cffec518 (diff)
downloaddrakx-1556b35a2faca162736df1158e2119c362b02fd2.tar
drakx-1556b35a2faca162736df1158e2119c362b02fd2.tar.gz
drakx-1556b35a2faca162736df1158e2119c362b02fd2.tar.bz2
drakx-1556b35a2faca162736df1158e2119c362b02fd2.tar.xz
drakx-1556b35a2faca162736df1158e2119c362b02fd2.zip
- deprecate "hdreiser.img" since we have room for "reiserfs.o" in "hd.img"
- following deprecation of "other.img", reintegrate big modules in relevant boot disks
-rw-r--r--Makefile2
-rw-r--r--docs/README1
-rwxr-xr-xmake_boot_img5
-rw-r--r--perl-install/modules.pm7
-rwxr-xr-xupdate_kernel6
5 files changed, 9 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index e63504582..0fa4ac19a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
ARCH := $(patsubst i%86,i386,$(shell uname -m))
ARCH := $(patsubst sparc%,sparc,$(ARCH))
-RELEASE_BOOT_IMG = cdrom.img hd.img hdreiser.img network.img
+RELEASE_BOOT_IMG = cdrom.img hd.img network.img
ifeq (i386,$(ARCH))
RELEASE_BOOT_IMG += blank.img pcmcia.img
endif
diff --git a/docs/README b/docs/README
index e92420e6f..bdc06fdd1 100644
--- a/docs/README
+++ b/docs/README
@@ -90,7 +90,6 @@ images/*.img
- cdrom for cdrom install
- network for ftp/nfs install (non-pcmcia devices)
- hd for hard-disk install
- - hdreiser for hard-disk install on a reiserfs partition
- pcmcia for pcmcia install (see ``PCMCIA install'' below for more)
the following modules have been removed from:
diff --git a/make_boot_img b/make_boot_img
index 39bfdcbdc..85f10856d 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-@ARGV >= 2 or die "usage: $0 <image> all|other|cdrom|hd|hdreiser|network|blank|pcmcia|live|tftp|tftprd\n";
+@ARGV >= 2 or die "usage: $0 <image> all|other|cdrom|hd|network|blank|pcmcia|live|tftp|tftprd\n";
use Config;
Config->import;
@@ -35,7 +35,6 @@ $install = $ {{
network => "stage1-network",
cdrom => "stage1-cdrom",
hd => "stage1-disk",
- hdreiser => "stage1-disk",
live64 => "stage1-full",
tftp64 => "stage1-full",
tftprd64 => "stage1-full",
@@ -87,7 +86,7 @@ sub boot_img_i386 {
__ "$sudo umount $mnt 2>/dev/null";
my $automatic = "";
- if ($type eq "hd" || $type eq "hdreiser") {
+ if ($type eq "hd") {
_ "bunzip2 -c $instdir/init-data/msgboot.img.bz2 > $img";
$automatic = "automatic=method:disk";
} elsif ($type eq "all") {
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index a094d8409..3953ea29d 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -331,10 +331,11 @@ my %type_aliases = (
my @skip_big_modules_on_stage1 =
qw(
-acenic sk98lin
-BusLogic seagate fdomain g_NCR5380 tmscsim
-gdth eata eata_pio eata_dma
+sk98lin
); #******(missing-2.4) dpt_i2o aztcd gscd isp16 mcd mcdx optcd cm206 sjcd cdu31a
+#acenic
+#BusLogic seagate fdomain g_NCR5380 tmscsim
+#gdth eata eata_pio eata_dma
my @skip_modules_on_stage1 = (
diff --git a/update_kernel b/update_kernel
index 551913306..f3b9f9282 100755
--- a/update_kernel
+++ b/update_kernel
@@ -37,11 +37,10 @@ f "pcmcia net cdrom scsi disk keepbig" ; ALL_DRIVERS=$v
NETWORK_MODULES=" $NETWORK_DRIVERS"
CDROM_MODULES=" $CD_DRIVERS"
-HD_MODULES=" $DOSMODULES $SCSI_DRIVERS $DISK_DRIVERS loop.o isofs.o"
-HDREISER_MODULES=" $DOSMODULES $SCSI_DRIVERS loop.o isofs.o reiserfs.o"
+HD_MODULES=" $DOSMODULES $SCSI_DRIVERS $DISK_DRIVERS loop.o isofs.o reiserfs.o"
PCMCIA_MODULES=" $DOSMODULES $PCMCIA_DRIVERS"
BIG_MODULES=" $BIG_DRIVERS"
-ALL_MODULES=" $DOSMODULES $ALL_DRIVERS isa-pnp.o reiserfs.o"
+ALL_MODULES=" $DOSMODULES $ALL_DRIVERS loop.o isofs.o reiserfs.o"
NOT_USEFULL_IN_STAGE1="nls_*.o parport_probe.o raid*.o serial.o smbfs.o usb-*.o"
GENERIC_MODULES="isa-pnp.o floppy.o"
@@ -69,7 +68,6 @@ rm -rf modules ; install -d modules
create_marfile network_modules.mar $NETWORK_MODULES $GENERIC_MODULES
create_marfile cdrom_modules.mar $CDROM_MODULES $GENERIC_MODULES
create_marfile hd_modules.mar $HD_MODULES $GENERIC_MODULES
- create_marfile hdreiser_modules.mar $HDREISER_MODULES $GENERIC_MODULES
create_marfile pcmcia_modules.mar $PCMCIA_MODULES $PCMCIA_COREMODULES $GENERIC_MODULES
create_marfile other_modules.mar $BIG_MODULES $GENERIC_MODULES
create_marfile all_modules.mar $ALL_MODULES $GENERIC_MODULES