Revert '-b' change. Forgot required bsd.rd tweak.

diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index bea5e2a..826b034 100644 (file)
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: fdisk.c,v 1.136 2021/09/26 12:24:53 krw Exp $ */
+/*     $OpenBSD: fdisk.c,v 1.137 2021/09/26 13:13:16 krw Exp $ */
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -86,7 +86,6 @@ main(int argc, char *argv[])
                        break;
                case 'b':
                        parse_bootprt(optarg);
-                       disk.dk_bootprt.prt_flag = DOSACTIVE;
                        break;
                case 'c':
                        disk.dk_cylinders = strtonum(optarg, 1, 262144, &errstr);

diff --git a/sbin/fdisk/mbr.c b/sbin/fdisk/mbr.c
index 93cbfa9..b14863d 100644 (file)
--- a/sbin/fdisk/mbr.c
+++ b/sbin/fdisk/mbr.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mbr.c,v 1.100 2021/09/26 12:24:53 krw Exp $   */
+/*     $OpenBSD: mbr.c,v 1.101 2021/09/26 13:13:16 krw Exp $   */
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -110,8 +110,6 @@ MBR_init(struct mbr *mbr)
 #else
        if (disk.dk_bootprt.prt_ns > 0) {
                mbr->mbr_prt[0] = disk.dk_bootprt;
-               if (mbr->mbr_prt[0].prt_flag == DOSACTIVE)
-                       mbr->mbr_prt[3].prt_flag = 0;
                PRT_fix_CHS(&mbr->mbr_prt[0]);
                mbr->mbr_prt[3].prt_ns += mbr->mbr_prt[3].prt_bs;
                mbr->mbr_prt[3].prt_bs = mbr->mbr_prt[0].prt_bs + mbr->mbr_prt[0].prt_ns;