From 3650a7012734472f6dd59c34795852af403686e8 Mon Sep 17 00:00:00 2001
From: dsl <dsl@NetBSD.org>
Date: Mon, 14 Mar 2005 21:37:43 +0000
Subject: [PATCH] Allow the user to change the partition type from FFSv1 to
 FFSv2 Should fix install/29693

---
 distrib/utils/sysinst/label.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/distrib/utils/sysinst/label.c b/distrib/utils/sysinst/label.c
index 7c255f62fcd7..ff93bd05ee70 100644
--- a/distrib/utils/sysinst/label.c
+++ b/distrib/utils/sysinst/label.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: label.c,v 1.46 2005/01/20 21:59:36 dsl Exp $	*/
+/*	$NetBSD: label.c,v 1.47 2005/03/14 21:37:43 dsl Exp $	*/
 
 /*
  * Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.46 2005/01/20 21:59:36 dsl Exp $");
+__RCSID("$NetBSD: label.c,v 1.47 2005/03/14 21:37:43 dsl Exp $");
 #endif
 
 #include <sys/types.h>
@@ -198,7 +198,7 @@ edit_fs_size(menudesc *m, void *arg)
 void
 set_ptype(partinfo *p, int fstype, int flag)
 {
-	p->pi_flags = p->pi_flags & ~PIF_FFSv2;
+	p->pi_flags = (p->pi_flags & ~PIF_FFSv2) | flag;
 
 	if (p->pi_fstype == fstype)
 		return;
@@ -208,7 +208,6 @@ set_ptype(partinfo *p, int fstype, int flag)
 		p->pi_frag = 8;
 		/* match newfs defaults for fragments size (2k if >= 1024MB) */
 		p->pi_fsize = p->pi_size > 1024*1024*1024 / 512 ? 2048 : 1024;
-		p->pi_flags |= flag;
 	} else {
 		/* zero - fields not used */
 		p->pi_frag = 0;