diff options
-rw-r--r-- | sbin/newfs/mkfs.c | 5 | ||||
-rw-r--r-- | sys/ufs/ffs/fs.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index 1c117e6..4cbce26 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -259,7 +259,7 @@ mkfs(struct partition *pp, char *fsys) sblock.fs_old_postblformat = 1; sblock.fs_old_nrpos = 1; } else { - sblock.fs_magic = FS_UFS2_MAGIC; + sblock.fs_magic = FS_BAD2_MAGIC; sblock.fs_sblockloc = SBLOCK_UFS2; sblock.fs_nindir = sblock.fs_bsize / sizeof(ufs2_daddr_t); sblock.fs_inopb = sblock.fs_bsize / sizeof(struct ufs2_dinode); @@ -449,6 +449,9 @@ mkfs(struct partition *pp, char *fsys) chdummy, SBLOCKSIZE); } } + if (!Nflag) + sbwrite(&disk, 0); + sblock.fs_magic = FS_UFS2_MAGIC; /* * Now build the cylinders group blocks and diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h index 3aaa375..dc68435 100644 --- a/sys/ufs/ffs/fs.h +++ b/sys/ufs/ffs/fs.h @@ -361,6 +361,7 @@ CTASSERT(sizeof(struct fs) == 1376); */ #define FS_UFS1_MAGIC 0x011954 /* UFS1 fast filesystem magic number */ #define FS_UFS2_MAGIC 0x19540119 /* UFS2 fast filesystem magic number */ +#define FS_BAD2_MAGIC 0x19960408 /* UFS2 incomplete newfs magic number */ #define FS_OKAY 0x7c269d38 /* superblock checksum */ #define FS_42INODEFMT -1 /* 4.2BSD inode format */ #define FS_44INODEFMT 2 /* 4.4BSD inode format */ |