X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=README.ultrix;h=acc92a7a2539a1dff0b345e523123c1e20be1d15;hp=08d1968088c2ddf3f198c227657f2b4e513c7a73;hb=be9ecce3c61067bd22186fc1e2cd4355e0f0747d;hpb=bbe9c77aafc5d183eb3c29879563e4c9b95bc1b6;ds=sidebyside

diff --git a/README.ultrix b/README.ultrix
index 08d1968..acc92a7 100644
--- a/README.ultrix
+++ b/README.ultrix
@@ -2,8 +2,8 @@
 Installing PPP on an Ultrix system requires rebuilding the kernel and
 rebooting, in addition to making and installing the pppd and chat
 programs.  These instructions apply to RISC (MIPS) systems.  This
-software has been tested under Ultrix 4.4; it should also work under
-Ultrix 4.2 or 4.3.
+software should work under Ultrix 4.2, 4.3 or 4.4 (this release has
+not been tested yet).
 
 
 Kernel installation procedure.
@@ -16,7 +16,7 @@ installed in the kernel, follow these steps:
 
 2. Apply the patches in the file ultrix/patches using the command:
 
-	patch -p <ultrix/patches
+	patch -p -N <ultrix/patches
 
 This will edit the following files, saving the original versions in a
 file with `.orig' appended to the name:
@@ -65,23 +65,20 @@ of your old /vmunix in / under a different name.
 
 7. Reboot the system.
 
+********
 
-If you have ppp-2.1.2 or earlier already installed in your kernel,
-some files will already have been modified as required.  The files
-which still need to be modified are:
+If you have ppp-2.2 already installed in your kernel, most files will
+already have been modified as required.  You will need to add some
+entries to /usr/sys/conf/mips/files.mips.  You can do this with a
+command like this (as root):
 
-	/usr/sys/net/net/netisr.h
-	/usr/sys/net/net/conf_net.c
-	/usr/sys/conf/mips/files.mips
+	patch -p -N <ultrix/upgrade
 
-The file ultrix/upgrade is a patch file to modify these files.  The
-upgrade procedure is much the same as the installation procedure
-described above, except that you use ultrix/upgrade in step 2 instead
-of ultrix/patches, and step 4 should already have been done.
+Alternatively, edit /usr/sys/conf/mips/files.mips according to the
+differences shown in ultrix/upgrade.
 
-Earlier versions of ppp-2.x replaced if.o with a modified version.
-This version does not need the modifications, so you can use either
-the original or the modified version.
+Then, proceed with steps 3, 5, 6, 7 above (step 4 should have been
+done already).
 
 
 Installing pppd and chat.
@@ -113,11 +110,9 @@ and
 	and also RO Komm. & Konsult
 	email: robert@robur.slu.se
 
-It was updated to ppp-2.2 by
+It was updated to ppp-2.3 by
 
 	Paul Mackerras
 	Dept. of Computer Science
 	Australian National University
 	paulus@cs.anu.edu.au
-
-(with some assistance from Per Sundstrom).