summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2000-09-22 22:36:52 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2000-09-22 22:36:52 +0000
commit9259442e1c4374f2bb0daa07cde14a889db8911f (patch)
treec9d61e0fcc9a00888b3827e4fbb24d73375e3c47
parent046c5b383794bfe42480723d32bbb91380671bab (diff)
downloaddrakx-9259442e1c4374f2bb0daa07cde14a889db8911f.tar
drakx-9259442e1c4374f2bb0daa07cde14a889db8911f.tar.gz
drakx-9259442e1c4374f2bb0daa07cde14a889db8911f.tar.bz2
drakx-9259442e1c4374f2bb0daa07cde14a889db8911f.tar.xz
drakx-9259442e1c4374f2bb0daa07cde14a889db8911f.zip
try to fix hd_reiser.img
-rw-r--r--Makefile2
-rwxr-xr-xmake_boot_img4
-rwxr-xr-xupdate_kernel4
3 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 58216f3c1..d2c853bb3 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 = hd.img hd_reiser.img cdrom.img network.img
+RELEASE_BOOT_IMG = hd.img hdreiser.img cdrom.img network.img
ifeq (i386,$(ARCH))
RELEASE_BOOT_IMG += pcmcia.img blank.img all.img other.img
endif
diff --git a/make_boot_img b/make_boot_img
index b41905f89..8aca92237 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|hd_reiser|network|blank|pcmcia|live|tftp|tftprd\n";
+@ARGV >= 2 or die "usage: $0 <image> all|other|cdrom|hd|hdreiser|network|blank|pcmcia|live|tftp|tftprd\n";
use Config;
Config->import;
@@ -35,7 +35,7 @@ $install = $ {{
network => "install",
cdrom => "local-install",
hd => "local-install",
- hd_reiser => "local-install",
+ hdreiser => "local-install",
live64 => "full-install",
tftp64 => "full-install",
tftprd64 => "full-install",
diff --git a/update_kernel b/update_kernel
index 68d0bd268..ab03e97fa 100755
--- a/update_kernel
+++ b/update_kernel
@@ -20,7 +20,7 @@ f "pcmcia net cdrom scsi disk keepbig" ; ALL_DRIVERS=$v
NETWORK_MODULES=" $FSMODULES $NETWORK_DRIVERS"
CDROM_MODULES=" $FSMODULES $CD_DRIVERS"
HD_MODULES=" $FSMODULES $SCSI_DRIVERS $DISK_DRIVERS loop.o isofs.o"
-HD_REISER_MODULES="$FSMODULES $SCSI_DRIVERS reiserfs.o loop.o isofs.o"
+HDREISER_MODULES=" $FSMODULES $SCSI_DRIVERS reiserfs.o loop.o isofs.o"
PCMCIA_MODULES=" $FSMODULES $PCMCIA_DRIVERS"
BIG_MODULES=" $FSMODULES $BIG_DRIVERS"
ALL_MODULES=" $FSMODULES $ALL_DRIVERS reiserfs.o"
@@ -49,7 +49,7 @@ rm -rf modules ; install -d modules
ls $NETWORK_MODULES | cpio --quiet -H crc -o | gzip -9 > network_modules.cgz
ls $CDROM_MODULES | cpio --quiet -H crc -o | gzip -9 > cdrom_modules.cgz
ls $HD_MODULES | cpio --quiet -H crc -o | gzip -9 > hd_modules.cgz
- ls $HD_REISER_MODULES| cpio --quiet -H crc -o | gzip -9 > hd_reiser_modules.cgz
+ ls $HDREISER_MODULES| cpio --quiet -H crc -o | gzip -9 > hdreiser_modules.cgz
ls $PCMCIA_MODULES | cpio --quiet -H crc -o | gzip -9 > pcmcia_modules.cgz
ls $BIG_MODULES | cpio --quiet -H crc -o | gzip -9 > other_modules.cgz
ls $ALL_MODULES | cpio --quiet -H crc -o | gzip -9 > all_modules.cgz