[src/trunk]: src/usr.sbin/sysinst Enhance support for the pseudo file system ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2f4b93556d82
branches:  trunk
changeset: 366736:2f4b93556d82
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jun 11 15:41:19 2022 +0000

description:
Enhance support for the pseudo file system type "EFI System Partition".

diffstat:

 usr.sbin/sysinst/gpt.c   |  4 +++-
 usr.sbin/sysinst/label.c |  6 +++---
 usr.sbin/sysinst/mbr.c   |  6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diffs (72 lines):

diff -r 3ef9f9fdd24b -r 2f4b93556d82 usr.sbin/sysinst/gpt.c
--- a/usr.sbin/sysinst/gpt.c    Sat Jun 11 15:30:48 2022 +0000
+++ b/usr.sbin/sysinst/gpt.c    Sat Jun 11 15:41:19 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gpt.c,v 1.28 2022/01/30 11:58:29 martin Exp $  */
+/*     $NetBSD: gpt.c,v 1.29 2022/06/11 15:41:19 martin Exp $  */
 
 /*
  * Copyright 2018 The NetBSD Foundation, Inc.
@@ -103,6 +103,8 @@
          .fsflags = GLM_MAYBE_FAT32|GLM_MAYBE_NTFS },
        { .name = "efi",        .fstype = FS_MSDOS,     .ptype = PT_EFI_SYSTEM,
          .fsflags = GLM_MAYBE_FAT32 },
+       { .name = "efi",        .fstype = FS_EFI_SP,    .ptype = PT_EFI_SYSTEM,
+         .fsflags = GLM_MAYBE_FAT32 },
        { .name = "bios",       .fstype = FS_MSDOS,     .ptype = PT_FAT,
          .fsflags = GLM_MAYBE_FAT32 },
        { .name = "lfs",        .fstype = FS_BSDLFS,    .ptype = PT_root },
diff -r 3ef9f9fdd24b -r 2f4b93556d82 usr.sbin/sysinst/label.c
--- a/usr.sbin/sysinst/label.c  Sat Jun 11 15:30:48 2022 +0000
+++ b/usr.sbin/sysinst/label.c  Sat Jun 11 15:41:19 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: label.c,v 1.34 2022/06/09 18:26:06 martin Exp $        */
+/*     $NetBSD: label.c,v 1.35 2022/06/11 15:41:19 martin Exp $        */
 
 /*
  * Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.34 2022/06/09 18:26:06 martin Exp $");
+__RCSID("$NetBSD: label.c,v 1.35 2022/06/11 15:41:19 martin Exp $");
 #endif
 
 #include <sys/types.h>
@@ -1079,7 +1079,7 @@
                        continue;
                if (m->opts[i].opt_action == edit_fs_preserve &&
                    t != FS_BSDFFS && t != FS_BSDLFS && t != FS_APPLEUFS &&
-                   t != FS_MSDOS && t != FS_EX2FS) {
+                   t != FS_MSDOS && t != FS_EFI_SP && t != FS_EX2FS) {
                        /* Can not newfs this filesystem */
                        edit->wanted->instflags &= ~PUIINST_NEWFS;
                        continue;
diff -r 3ef9f9fdd24b -r 2f4b93556d82 usr.sbin/sysinst/mbr.c
--- a/usr.sbin/sysinst/mbr.c    Sat Jun 11 15:30:48 2022 +0000
+++ b/usr.sbin/sysinst/mbr.c    Sat Jun 11 15:41:19 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbr.c,v 1.44 2022/06/11 15:30:48 martin Exp $ */
+/*     $NetBSD: mbr.c,v 1.45 2022/06/11 15:41:19 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -117,7 +117,7 @@
        { .ptype=MBR_PTYPE_FAT16B, .desc="DOS FAT16, >32M" },
        { .ptype=MBR_PTYPE_FAT16L, .desc="Windows FAT16, LBA" },
        { .ptype=MBR_PTYPE_FAT32, .desc="Windows FAT32" },
-       { .ptype=MBR_PTYPE_EFI, .desc="(U)EFI Boot" },
+       { .ptype=MBR_PTYPE_EFI, .desc="(U)EFI system partition" },
 };
 
 /* bookeeping of available partition types (including custom ones) */
@@ -1187,6 +1187,8 @@
                        return &mbr_gen_type_desc[sub_type].gen;
                }
                break;
+       case FS_EFI_SP:
+               return &mbr_gen_type_desc[MBR_PTYPE_EFI].gen;
        }
 
        return NULL;