diff options
| author | Erik Troan <ewt@redhat.com> | 2001-12-16 04:58:27 +0000 |
|---|---|---|
| committer | Erik Troan <ewt@redhat.com> | 2001-12-16 04:58:27 +0000 |
| commit | ebe505c3ca826e5fb4d1e78ed37187c87ff52636 (patch) | |
| tree | 3209d8a6b26d9751f2dafa386560534f0c336ba6 /scripts | |
| parent | 79a700958d5255b4a44e1f25243ab02bf4422a80 (diff) | |
| download | anaconda-ebe505c3ca826e5fb4d1e78ed37187c87ff52636.tar.gz anaconda-ebe505c3ca826e5fb4d1e78ed37187c87ff52636.tar.xz anaconda-ebe505c3ca826e5fb4d1e78ed37187c87ff52636.zip | |
don't build special japanese images anymore
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mk-images | 10 | ||||
| -rw-r--r-- | scripts/mk-images.i386 | 42 |
2 files changed, 2 insertions, 50 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index 16805f895..df848d1fa 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -317,7 +317,6 @@ makeinitrd() { MODULEBALLNAME="modules.cgz" MYLANGTABLE=$LANGTABLE MYLOADERTR=loader.tr - JAPANESE="" while [ x$(echo $1 | cut -c1-2) = x"--" ]; do if [ $1 = "--initrdto" ]; then EXTRAINITRDPATH=$2 @@ -351,12 +350,6 @@ makeinitrd() { MODULEBALLNAME=$2 shift; shift continue - elif [ $1 = "--japanese" ]; then - MYLANGTABLE=$IMGPATH/usr/lib/anaconda/lang-table-kon - MYLOADERTR=kon-loader.tr - JAPANESE=1 - shift; - continue fi echo "Unknown option passed to makeinitrd" exit 1 @@ -406,9 +399,10 @@ EOF install -m 644 $KEYMAPS $MBD_DIR/etc/keymaps.gz install -m 644 $FONTS $MBD_DIR/etc/fonts.cgz install -m 644 $MYLANGTABLE $MBD_DIR/etc/lang-table + install -m 644 $LOADERBINDIR/$MYLOADERTR $MBD_DIR/etc/loader.tr install -m 644 $IMGPATH/usr/share/terminfo/l/linux $MBD_DIR/etc/terminfo/l/linux - if [ -n "$JAPANESE" ]; then + if [ -f $LOADERBINDIR/kon.cfg ]; then mkdir -p $MBD_DIR/etc/terminfo/k install -m 644 $IMGPATH/usr/share/terminfo/k/kon $MBD_DIR/etc/terminfo/k/kon install -m 644 $LOADERBINDIR/kon.cfg $MBD_DIR/etc diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386 index 73120bb19..1a2d5185b 100644 --- a/scripts/mk-images.i386 +++ b/scripts/mk-images.i386 @@ -138,9 +138,6 @@ for I in $BOOTDISKDIR `find $BOOTDISKDIR -type d | egrep "($TIER1LANGS)"`; do if [ $BOOTLANG = "boot" ]; then BOOTLANG="" BOOTDIR="" - elif [ $BOOTLANG = "ja_JP" ]; then - # this is handled below. - continue fi makebootdisk --kernelto $TOPDESTPATH/dosutils/autoboot/vmlinuz \ @@ -160,32 +157,6 @@ done rm -f $TOPDESTPATH/images/initrd-pcmcia.img -# --- Japanese -BOOTLANG="ja_JP" -BOOTDIR="ja" - -makebootdisk --bootdisksize 1440 \ - --imagename ja/boot.img \ - --initrdflags '--japanese - --initrdsize 2950 \ - --loaderbin loader-local-kon \ - --modules "$LOCALMODULES"' - -makebootdisk --bootdisksize 1440 \ - --imagename ja/bootnet.img \ - --initrdflags '--japanese - --initrdsize 2950 \ - --loaderbin loader-network-kon \ - --modules "$NETWORKMODULES"' - -makebootdisk --imagename ja/pcmcia.img \ - --bootdisksize 1440 \ - --initrdflags '--japanese - --pcmcia \ - --initrdsize 3232 \ - --loaderbin loader-pcmcia-kon \ - --modules "$PCMCIAMAINMODULES"' - makedriverdisk --padsize 1440 "Supplemental Block Device Drivers" "drvblock" "+scsi" makedriverdisk --padsize 1440 "Supplemental Network Drivers" "drvnet" "+net" @@ -208,19 +179,6 @@ makebootdisk --kernelto $TOPDESTPATH/dosutils/autoboot/vmlinuz \ --imagename ../dosutils/autoboot/cdboot.img \ --initrd $TOPDESTPATH/dosutils/autoboot/initrd.img -makeinitrd --initrdto $TOPDESTPATH/dosutils/autoboot/initrd-ja.img \ - --initrdsize 4100 \ - --japanese \ - --loaderbin loader-pcmcia-kon \ - --pcmcia \ - --modules "$COMMONMODULES $PCMCIAMODULES nfs =scsi $IDEMODS - $SCSIMODS" - -makebootdisk --kernelto $TOPDESTPATH/dosutils/autoboot/vmlinuz \ - --bootdisksize 2880 \ - --imagename ../dosutils/autoboot/cdboot-ja.img \ - --initrd $TOPDESTPATH/dosutils/autoboot/initrd-ja.img - makemainmodules "=scsi =net $SECSTAGE" makeinstimage "netstg" "=scsi $SECSTAGE" |