Try AGAIN to get the disklabel editor to do the right thing.

This is getting ridiculous.  I may have to put the clear() back
and take the performance penalty, Poul.

Tweak the TCP/IP setup menu to look a little nicer.

Add lp0 to the list of available network devices (it was found before
but simply not described properly).

3 files changed, 14 insertions, 14 deletions

diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c
index 5d103df..d39cae2 100644
--- a/usr.sbin/sade/devices.c
+++ b/usr.sbin/sade/devices.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: devices.c,v 1.25 1995/05/20 16:22:41 jkh Exp $
+ * $Id: devices.c,v 1.26 1995/05/21 15:40:46 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -92,6 +92,7 @@ static struct {
     { DEVICE_TYPE_FLOPPY, "rfd1",	"Floppy disk drive (unit B)"				},
     { DEVICE_TYPE_NETWORK, "cuaa0",	"Serial port (COM1) - possible PPP device"		},
     { DEVICE_TYPE_NETWORK, "cuaa1",	"Serial port (COM2) - possible PPP device"		},
+    { DEVICE_TYPE_NETWORK, "lp0",	"Parallel Port IP (PLIP) using laplink cable"		},
     { DEVICE_TYPE_NETWORK, "lo",	"Loop-back (local) network interface"			},
     { DEVICE_TYPE_NETWORK, "sl",	"Serial-line IP (SLIP) interface"			},
     { DEVICE_TYPE_NETWORK, "ppp",	"Point-to-Point Protocol (PPP) interface"		},
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index a796f93..5395e1c 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.18 1995/05/21 15:40:49 jkh Exp $
+ * $Id: label.c,v 1.19 1995/05/21 17:53:27 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -264,7 +264,6 @@ get_partition_type(void)
 	else if (!strcmp(selection, "Swap"))
 	    return PART_SWAP;
     }
-    clear();
     return PART_NONE;
 }
 
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index d8f046c..d081e3c 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.22 1995/05/20 20:30:11 jkh Exp $
+ * $Id: menus.c,v 1.23 1995/05/21 15:40:52 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -274,16 +274,16 @@ select one of the following tape devices detected on your system.",
 DMenu MenuNetworkDevice = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose a network interface type",
-    "FreeBSD can be installed directly over a network, using NFS\n\
-or FTP.  If you're using an ethernet card to talk to the world\n\
-then setup is pretty straight-forward.  If you are using PPP over\n\
-a serial device (cuaa0 or cuaa1) then you may need to dial your service\n\
-provider using a special PPP utility we provide for that purpose.\n\
-You can also install over your parallel port using a special \"laplink\"\n\
-cable, though this only works if you have another FreeBSD machine running\n\
-a fairly recent (2.0R or later) release to talk to.\n\n\
-To use PPP, select one of the serial devices, otherwise select lp0\n\
-for the parallel port or one of the ethernet controllers (if you have one)\n\
+"FreeBSD can be installed directly over a network, using NFS or FTP.\n
+If you're using an ethernet card to talk to the world then setup is\n\
+pretty straight-forward.  If you are using PPP over a serial device\n\
+(cuaa0 or cuaa1) then you may need to dial your service provider using\n\
+a special PPP utility we provide for that purpose.  You can also install\n\
+over your parallel port using a special \"laplink\" cable, though this\n\
+only works if you have another FreeBSD machine running a fairly recent\n\
+(2.0R or later) release to talk to.\n\n\
+To use PPP, select one of the serial devices, otherwise select lp0 for\n\
+the parallel port or one of the ethernet controllers (if you have one)\n\
 for an ethernet installation.",
     "Press F1 to read PPP user manual",
     "ppp.0",