Module Name: src
Committed By: snj
Date: Sat May 30 06:37:13 UTC 2009
Modified Files:
src/sbin/fdisk [netbsd-3]: fdisk.c
Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #2018):
sbin/fdisk/fdisk.c: revision 1.104
PR/36223: Milos Negovanovic: Don't ask if we want to install mbr_bootselect
with -f.
To generate a diff of this commit:
cvs rdiff -u -r1.88.2.1 -r1.88.2.2 src/sbin/fdisk/fdisk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fdisk/fdisk.c
diff -u src/sbin/fdisk/fdisk.c:1.88.2.1 src/sbin/fdisk/fdisk.c:1.88.2.2
--- src/sbin/fdisk/fdisk.c:1.88.2.1 Fri Feb 22 18:55:12 2008
+++ src/sbin/fdisk/fdisk.c Sat May 30 06:37:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fdisk.c,v 1.88.2.1 2008/02/22 18:55:12 bouyer Exp $ */
+/* $NetBSD: fdisk.c,v 1.88.2.2 2009/05/30 06:37:13 snj Exp $ */
/*
* Mach Operating System
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fdisk.c,v 1.88.2.1 2008/02/22 18:55:12 bouyer Exp $");
+__RCSID("$NetBSD: fdisk.c,v 1.88.2.2 2009/05/30 06:37:13 snj Exp $");
#endif /* not lint */
#define MBRPTYPENAMES
@@ -1865,8 +1865,9 @@
* somewhere to safely write the menu tag.
*/
if (le16toh(boot->mbr_bootsel_magic) != MBR_BS_MAGIC) {
- if (yesno("The bootselect code is not installed, "
- "do you want to install it now?"))
+ if (f_flag ||
+ yesno("The bootselect code is not installed, "
+ "do you want to install it now?"))
install_bootsel(MBR_BS_ACTIVE);
}
if (le16toh(boot->mbr_bootsel_magic) == MBR_BS_MAGIC) {
