 @@ -1,14 +1,14 @@
-/*	$NetBSD: fdisk.c,v 1.137 2011/12/02 04:05:20 enami Exp $ */
+/*	$NetBSD: fdisk.c,v 1.138 2011/12/02 15:21:15 christos Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -29,27 +29,27 @@
 /*
  * 14-Dec-89  Robert Baron (rvb) at Carnegie-Mellon University
  *	Copyright (c) 1989	Robert. V. Baron
  *	Created.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fdisk.c,v 1.137 2011/12/02 04:05:20 enami Exp $");
+__RCSID("$NetBSD: fdisk.c,v 1.138 2011/12/02 15:21:15 christos Exp $");
 #endif /* not lint */
 #define MBRPTYPENAMES
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
 #include <stdarg.h>
 #include <stddef.h>
 @@ -145,27 +145,27 @@ static const char *disk = _PATH_DEFDISK;
 static struct disklabel disklabel;		/* disk parameters */
 static struct mbr_sector mboot;
 static const char *boot_dir = DEFAULT_BOOTDIR;
 static char *boot_path = NULL;			/* name of file we actually opened */
 #ifdef BOOTSEL
 #define BOOTSEL_OPTIONS	"B"
 #else
 #define BOOTSEL_OPTIONS
 #define change_part(e, p, id, st, sz, bm) change__part(e, p, id, st, sz)
 #endif
-#define OPTIONS	BOOTSEL_OPTIONS "0123FSafiluvA:b:c:E:r:s:w:"
+#define OPTIONS	BOOTSEL_OPTIONS "0123FSafiIluvA:b:c:E:r:s:w:"
 /*
  * Disk geometry and partition alignment.
+ *
  * Modern disks do not have a fixed geomery and will always give a 'faked'
  * geometry that matches the ATA standard - max 16 heads and 256 sec/track.
  * The ATA geometry allows access to 2^28 sectors (as does LBA mode).
+ *
  * The BIOS calls originally used an 8bit register for cylinder, head and
  * sector. Later 2 bits were stolen from the sector number and added to
  * cylinder number. The BIOS will translate this faked geometry either to
  * the geometry reported by the disk, or do LBA reads (possibly LBA48).
  * BIOS CHS reads have all sorts of limits, but 2^24 is absolute.
 @@ -605,26 +605,27 @@ usage(void)
 	int indent = 7 + (int)strlen(getprogname()) + 1;
 	(void)fprintf(stderr, "usage: %s [-aBFfIilSuv] "
 		"[-A ptn_alignment[/ptn_0_offset]] \\\n"
 		"%*s[-b cylinders/heads/sectors] \\\n"
 		"%*s[-0123 | -E num "
 		"[-s id/start/size[/bootmenu]]] \\\n"
 		"%*s[-t disktab] [-T disktype] \\\n"
 		"%*s[-c bootcode] "
 		"[-r|-w file] [device]\n"
 		"\t-a change active partition\n"
 		"\t-f force - not interactive\n"
 		"\t-i initialise MBR code\n"
 		"\t-I ignore errors about no space or overlapping partitions\n"
 		"\t-l list partition types\n"
 		"\t-u update partition data\n"
 		"\t-v verbose output, -v -v more verbose still\n"
 		"\t-B update bootselect options\n"
 		"\t-F treat device as a regular file\n"
 		"\t-S output as shell defines\n"
 		"\t-r and -w access 'file' for non-destructive testing\n",
 		getprogname(), indent, "", indent, "", indent, "", indent, "");
 	exit(1);
+}
 static daddr_t
 ext_offset(int part)
 @@ -2055,27 +2056,27 @@ change_part(int extended, int part, int
 		if (start == 0) {
 			/* Look for first gap */
 			start = ptn_0_offset;
 			for (p = 0; p < MBR_PART_COUNT; p++) {
 				if (mboot.mbr_parts[p].mbrp_type == 0)
 					continue;
 				n_s = le32toh(mboot.mbr_parts[p].mbrp_start);
 				n_e = n_s + le32toh(mboot.mbr_parts[p].mbrp_size);
 				if (start >= n_s && start < n_e) {
 					start = n_e;
 					p = -1;
+				}
+			}
-			if (start >= disksectors) {
+			if (start >= disksectors && !I_flag) {
 				printf("No free space\n");
 				return 0;
+			}
+		}
+	}
 	if (!f_flag) {
 		/* request new values from user */
 		if (sysid == 0)
 			sysid = 169;
 		sysid = decimal("sysid", sysid, 0, 0, 255);
 		if (sysid == 0 && !v_flag) {
 			start = 0;