summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2001-10-16 01:21:37 +0000
committerStew Benedict <stewb@mandriva.org>2001-10-16 01:21:37 +0000
commita8bfa8dd7fa6c550cac65acc8ed9194b3d091785 (patch)
treedf010ba37febc14fe19f84678d37a0f39cbd677f
parentfb9f1f6ba999a37fba97305f60cc9970fa5ea898 (diff)
downloaddrakx-a8bfa8dd7fa6c550cac65acc8ed9194b3d091785.tar
drakx-a8bfa8dd7fa6c550cac65acc8ed9194b3d091785.tar.gz
drakx-a8bfa8dd7fa6c550cac65acc8ed9194b3d091785.tar.bz2
drakx-a8bfa8dd7fa6c550cac65acc8ed9194b3d091785.tar.xz
drakx-a8bfa8dd7fa6c550cac65acc8ed9194b3d091785.zip
typo in update kernel by /me
fine-tune sanity_check for ppc move /dev/nvram from list.ppc to devices.pl
-rwxr-xr-xmdk-stage1/pci-resource/update-pci-ids.pl4
-rw-r--r--rescue/devices.pl1
-rw-r--r--rescue/list.ppc1
-rwxr-xr-xupdate_kernel4
4 files changed, 7 insertions, 3 deletions
diff --git a/mdk-stage1/pci-resource/update-pci-ids.pl b/mdk-stage1/pci-resource/update-pci-ids.pl
index 881752aa6..517f06379 100755
--- a/mdk-stage1/pci-resource/update-pci-ids.pl
+++ b/mdk-stage1/pci-resource/update-pci-ids.pl
@@ -27,6 +27,10 @@ my %sanity_check =
( network => [ '3c59x', 'eepro100', 'e100', 'tulip', 'via-rhine', 'ne2k-pci', '8139too' ],
medias => [ 'aic7xxx', 'advansys', 'sym53c8xx', 'initio' ],
) :
+ arch() =~ /ppc/ ?
+ ( network => [ '3c59x', 'eepro100', 'tulip', 'via-rhine', 'ne2k-pci', '8139too' ],
+ medias => [ 'aic7xxx', 'sym53c8xx', 'initio' ],
+ ) :
( network => [ '3c59x', 'eepro100', 'e100', 'tulip', 'via-rhine', 'ne2k-pci', '8139too', 'tlan' ],
medias => [ 'aic7xxx', 'advansys', 'ncr53c8xx', 'sym53c8xx', 'initio' ],
);
diff --git a/rescue/devices.pl b/rescue/devices.pl
index 9dbd90366..985031fd0 100644
--- a/rescue/devices.pl
+++ b/rescue/devices.pl
@@ -50,3 +50,4 @@ b 33 64 hdf hdf1-16
b 34 0 hdg hdg1-16
b 34 64 hdh hdh1-16
b 8 0 sda sda1-15 sdb sdb1-15 sdc sdc1-15 sdd sdd1-15 sde sde1-15 sdf sdf1-15 sdg sdg1-15 sdh sdh1-15
+c 10 144 nvram
diff --git a/rescue/list.ppc b/rescue/list.ppc
index a3fddbfd9..1c835ef51 100644
--- a/rescue/list.ppc
+++ b/rescue/list.ppc
@@ -7,5 +7,4 @@
/usr/local/lib/yaboot/yaboot
/usr/local/sbin/ofpath
/sbin/nvsetenv
-/dev/nvram
/usr/bin/hformat
diff --git a/update_kernel b/update_kernel
index f0e39fd71..9d3390521 100755
--- a/update_kernel
+++ b/update_kernel
@@ -73,7 +73,7 @@ NETWORK_MODULES=" $NETWORK_DRIVERS"
USBNET_MODULES=" $USB_DRIVERS $USBNET_DRIVERS usbkbd.o keybdev.o input.o"
CDROM_MODULES=" $CD_DRIVERS"
HD_MODULES=" $DOSMODULES $SCSI_DRIVERS $DISK_DRIVERS loop.o isofs.o reiserfs.o"
-[ "$ARCH" == "ppc" ] && HD_MODULES="$HDMODULES hfs.o"
+[ "$ARCH" == "ppc" ] && HD_MODULES="$HD_MODULES hfs.o"
PCMCIA_MODULES=" $DOSMODULES $PCMCIA_DRIVERS"
BIG_MODULES=" $BIG_DRIVERS"
ALL_MODULES=" $DOSMODULES $ALL_DRIVERS loop.o isofs.o reiserfs.o"
@@ -131,7 +131,7 @@ install_kernel() {
v=2.4.8-5mdk
vv=${v}BOOT
rm -rf all.kernels/$(cat all.kernels/.main)
- scp kenobi:~chmou/public_html/kernel/BOOT/kernel-BOOT-$v.i586.rpm /tmp
+ scp kenobi:~chmou/public_html/kernel-BOOT/kernel-BOOT-$v.i586.rpm /tmp
cd ~/gi/all.kernels ; rm -rf $vv ; mkdir $vv ; cd $vv ; rpm2cpio /tmp/kernel-BOOT-$v.i586.rpm | cpio -id
cd ~/gi ; ./update_kernel ; rm -f images/network.rdz ; ./make_boot_img images/network.rdz network
/bin/cp -f all.kernels/$vv/boot/vmlinu* /var/lib/tftpboot/vmlinuz