From: Barry Naujok <bnaujok@sgi.com>
Date: Wed, 27 Aug 2008 04:13:09 +0000 (+0000)
Subject: Don't destroy file with -N -d file options
X-Git-Tag: v3.0.0~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b337ddf1d5ce8172a4badf044d6150841d6a155e;p=thirdparty%2Fxfsprogs-dev.git

Don't destroy file with -N -d file options
Merge of master-melb:xfs-cmds:31978a by kenmcd.

  Don't destroy file with -N -d file options
---

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 53e5c75ad..0bd480523 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -819,7 +819,7 @@ main(
 					xi.disfile = atoi(value);
 					if (xi.disfile < 0 || xi.disfile > 1)
 						illegal(value, "d file");
-					if (xi.disfile)
+					if (xi.disfile && !Nflag)
 						xi.dcreat = 1;
 					break;
 				case D_NAME: