Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/sysinst Deal with even stranger fictious empty disk...



details:   https://anonhg.NetBSD.org/src/rev/2d3599130486
branches:  trunk
changeset: 968600:2d3599130486
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jan 21 20:04:30 2020 +0000

description:
Deal with even stranger fictious empty disklabels (PR kern/54882).

diffstat:

 usr.sbin/sysinst/disklabel.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 90e146ec37ea -r 2d3599130486 usr.sbin/sysinst/disklabel.c
--- a/usr.sbin/sysinst/disklabel.c      Tue Jan 21 18:33:47 2020 +0000
+++ b/usr.sbin/sysinst/disklabel.c      Tue Jan 21 20:04:30 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.c,v 1.32 2020/01/21 06:44:40 mrg Exp $       */
+/*     $NetBSD: disklabel.c,v 1.33 2020/01/21 20:04:30 martin Exp $    */
 
 /*
  * Copyright 2018 The NetBSD Foundation, Inc.
@@ -302,7 +302,7 @@
                for (int part = 0; part < parts->l.d_npartitions; part++) {
                        if (parts->l.d_partitions[part].p_fstype == FS_UNUSED)
                                continue;
-                       if (part == 0 &&
+                       if (/* part == 0 && */  /* PR kern/54882 */
                            parts->l.d_partitions[part].p_offset ==
                             parts->l.d_partitions[RAW_PART].p_offset &&
                            parts->l.d_partitions[part].p_size ==



Home | Main Index | Thread Index | Old Index