Sat Dec 10 16:52:02 2022 UTC ()
Always map FS_BSDFFS to one of "FFS", "FFSv2" or "FFSv2ea" - previously
the disklabel name "4.2BSD" could show up initially but we could never
go back to it via the menu used to change the file system type.
This was confusing.


(martin)
diff -r1.92 -r1.93 src/usr.sbin/sysinst/disks.c
cvs diff -r1.92 -r1.93 src/usr.sbin/sysinst/disks.c (expand / switch to unified diff)

--- src/usr.sbin/sysinst/disks.c 2022/11/30 19:44:06 1.92
+++ src/usr.sbin/sysinst/disks.c 2022/12/10 16:52:02 1.93
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: disks.c,v 1.92 2022/11/30 19:44:06 martin Exp $ */ 1/* $NetBSD: disks.c,v 1.93 2022/12/10 16:52:02 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -104,27 +104,27 @@ static void fixsb(const char *, const ch @@ -104,27 +104,27 @@ static void fixsb(const char *, const ch
104 104
105 105
106static bool tmpfs_on_var_shm(void); 106static bool tmpfs_on_var_shm(void);
107 107
108const char * 108const char *
109getfslabelname(uint f, uint f_version) 109getfslabelname(uint f, uint f_version)
110{ 110{
111 if (f == FS_TMPFS) 111 if (f == FS_TMPFS)
112 return "tmpfs"; 112 return "tmpfs";
113 else if (f == FS_MFS) 113 else if (f == FS_MFS)
114 return "mfs"; 114 return "mfs";
115 else if (f == FS_EFI_SP) 115 else if (f == FS_EFI_SP)
116 return msg_string(MSG_fs_type_efi_sp); 116 return msg_string(MSG_fs_type_efi_sp);
117 else if (f == FS_BSDFFS && f_version > 0) { 117 else if (f == FS_BSDFFS) {
118 switch (f_version) { 118 switch (f_version) {
119 default: 119 default:
120 case 1: return msg_string(MSG_fs_type_ffs); 120 case 1: return msg_string(MSG_fs_type_ffs);
121 case 2: return msg_string(MSG_fs_type_ffsv2); 121 case 2: return msg_string(MSG_fs_type_ffsv2);
122 case 3: return msg_string(MSG_fs_type_ffsv2ea); 122 case 3: return msg_string(MSG_fs_type_ffsv2ea);
123 } 123 }
124 } else if (f == FS_EX2FS && f_version == 1) 124 } else if (f == FS_EX2FS && f_version == 1)
125 return msg_string(MSG_fs_type_ext2old); 125 return msg_string(MSG_fs_type_ext2old);
126 else if (f >= __arraycount(fstypenames) || fstypenames[f] == NULL) 126 else if (f >= __arraycount(fstypenames) || fstypenames[f] == NULL)
127 return "invalid"; 127 return "invalid";
128 return fstypenames[f]; 128 return fstypenames[f];
129} 129}
130 130