Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't overwrite the filesystem type unconditionally with the FFSv1 or v2 

setup for an architectures default - now we have /tmp on tmpfs back.
This commit is contained in:
martin 2019-07-15 19:13:05 +00:00
parent d1a5991552
commit 1f21161492
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/sysinst/bsddisklabel.c
View File

@ -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. * Copyright 1997 Piermont Information Systems Inc.
@ -1025,7 +1025,9 @@ fill_defaults(struct partition_usage_set *wanted, struct disk_partitions *parts,
else else
def_usr = i; def_usr = i;
} }
if (wanted->infos[i].fs_type == FS_UNUSED)
wanted->infos[i].fs_type = FS_BSDFFS; wanted->infos[i].fs_type = FS_BSDFFS;
if (wanted->infos[i].fs_type == FS_BSDFFS) {
#ifdef DEFAULT_UFS2 #ifdef DEFAULT_UFS2
#ifndef HAVE_UFS2_BOOT #ifndef HAVE_UFS2_BOOT
if (boot < wanted->num || i != root) if (boot < wanted->num || i != root)
@ -1033,6 +1035,7 @@ fill_defaults(struct partition_usage_set *wanted, struct disk_partitions *parts,
wanted->infos[i].fs_version = 2; wanted->infos[i].fs_version = 2;
#endif #endif
} }
}
if ((wanted->infos[i].flags & PUIFLG_JUST_MOUNTPOINT) && if ((wanted->infos[i].flags & PUIFLG_JUST_MOUNTPOINT) &&
wanted->infos[i].size == 0) wanted->infos[i].size == 0)
/* default tmpfs to 1/4 RAM */ /* default tmpfs to 1/4 RAM */