Module Name: src
Committed By: martin
Date: Mon Jul 15 19:13:05 UTC 2019
Modified Files:
src/usr.sbin/sysinst: bsddisklabel.c
Log Message:
Don't overwrite the filesystem type unconditionally with the FFSv1 or v2
setup for an architectures default - now we have /tmp on tmpfs back.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/sysinst/bsddisklabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.20 src/usr.sbin/sysinst/bsddisklabel.c:1.21
--- src/usr.sbin/sysinst/bsddisklabel.c:1.20 Sun Jul 14 11:26:18 2019
+++ src/usr.sbin/sysinst/bsddisklabel.c Mon Jul 15 19:13:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.20 2019/07/14 11:26:18 martin Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.21 2019/07/15 19:13:05 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1025,13 +1025,16 @@ fill_defaults(struct partition_usage_set
else
def_usr = i;
}
- wanted->infos[i].fs_type = FS_BSDFFS;
+ if (wanted->infos[i].fs_type == FS_UNUSED)
+ wanted->infos[i].fs_type = FS_BSDFFS;
+ if (wanted->infos[i].fs_type == FS_BSDFFS) {
#ifdef DEFAULT_UFS2
#ifndef HAVE_UFS2_BOOT
- if (boot < wanted->num || i != root)
+ if (boot < wanted->num || i != root)
#endif
- wanted->infos[i].fs_version = 2;
+ wanted->infos[i].fs_version = 2;
#endif
+ }
}
if ((wanted->infos[i].flags & PUIFLG_JUST_MOUNTPOINT) &&
wanted->infos[i].size == 0)
