summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1998-10-17 08:03:52 +0000
committerbde <bde@FreeBSD.org>1998-10-17 08:03:52 +0000
commit1849cbd4d1acf75dccf1e1219cc03ef2e53df578 (patch)
tree008d9d9bee77d66bb1c826e746fedbc5e427bb52 /sbin
parentb92f5250f91ed71966b7f5f4453a19988f31871b (diff)
downloadFreeBSD-src-1849cbd4d1acf75dccf1e1219cc03ef2e53df578.zip
FreeBSD-src-1849cbd4d1acf75dccf1e1219cc03ef2e53df578.tar.gz
Backed out previous commit. It broke fsck again. See rev.1.22 and the
references there, and rev.1.38 of sys/ufs/ufs/ufs_disksubr.c.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/newfs/newfs.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 71688e8..84bae0b 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95";
#endif
static const char rcsid[] =
- "$Id: newfs.c,v 1.25 1998/09/30 07:53:52 grog Exp $";
+ "$Id: newfs.c,v 1.26 1998/10/17 04:19:29 jkh Exp $";
#endif /* not lint */
/*
@@ -601,10 +601,8 @@ havelabel:
if (realsectorsize != DEV_BSIZE)
pp->p_size /= realsectorsize /DEV_BSIZE;
#endif
-#if 0 /* XXX this shouldn't fail, but it returns ENXDEV right now - pure workaround, this */
if (!Nflag && bcmp(pp, &oldpartition, sizeof(oldpartition)))
rewritelabel(special, fso, lp);
-#endif
if (!Nflag)
close(fso);
close(fsi);
OpenPOWER on IntegriCloud