diff options
author | 1998-07-26 17:40:38 +0000 | |
---|---|---|
committer | 1998-07-26 17:40:38 +0000 | |
commit | 9c5f1350889d9914f1bba11827d5e98d710a352e (patch) | |
tree | d6b608a5726ff01f0bcd383dc1d7c2ade30e00bd | |
parent | When asking the user for the disk type, base the default on the device name. Ie: wd -> IDE, sd -> SCSI, hd -> HP-IB, etc. Should help eliminate some confusion. (diff) | |
download | wireguard-openbsd-9c5f1350889d9914f1bba11827d5e98d710a352e.tar.xz wireguard-openbsd-9c5f1350889d9914f1bba11827d5e98d710a352e.zip |
Don't skip 'b' when suggesting the next partition to add. I thought it would be confusing to suggest 'b' but what happens is that people build a disk without swap.
-rw-r--r-- | sbin/disklabel/editor.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c index 22569ca2990..4ab0770d981 100644 --- a/sbin/disklabel/editor.c +++ b/sbin/disklabel/editor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: editor.c,v 1.40 1998/07/26 17:36:09 millert Exp $ */ +/* $OpenBSD: editor.c,v 1.41 1998/07/26 17:40:38 millert Exp $ */ /* * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,7 +28,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: editor.c,v 1.40 1998/07/26 17:36:09 millert Exp $"; +static char rcsid[] = "$OpenBSD: editor.c,v 1.41 1998/07/26 17:40:38 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -378,10 +378,9 @@ editor_add(lp, freep, p) return; } } else { - /* Find first unused partition that is not 'b' or 'c' */ + /* Find first unused partition that is not 'c' */ for (partno = 0; partno < MAXPARTITIONS; partno++, p++) { - if (lp->d_partitions[partno].p_size == 0 && - partno != 1 && partno != 2) + if (lp->d_partitions[partno].p_size == 0 && partno != 2) break; } if (partno < MAXPARTITIONS) { |