Source-Changes-HG archive

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

[src/trunk]: src/usr.sbin/sysinst If there is no current partitioning manager...



details:   https://anonhg.NetBSD.org/src/rev/c857d5c7d636
branches:  trunk
changeset: 955371:c857d5c7d636
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 27 17:51:48 2020 +0000

description:
If there is no current partitioning manager assume we are editing the
current system and make target_already_root() return true.
Fixes various fallout when using sysinst post installation.

diffstat:

 usr.sbin/sysinst/target.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r bfb14d44d7fc -r c857d5c7d636 usr.sbin/sysinst/target.c
--- a/usr.sbin/sysinst/target.c Sun Sep 27 17:36:40 2020 +0000
+++ b/usr.sbin/sysinst/target.c Sun Sep 27 17:51:48 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: target.c,v 1.13 2020/02/19 18:08:03 martin Exp $       */
+/*     $NetBSD: target.c,v 1.14 2020/09/27 17:51:48 martin Exp $       */
 
 /*
  * Copyright 1997 Jonathan Stone
@@ -71,7 +71,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: target.c,v 1.13 2020/02/19 18:08:03 martin Exp $");
+__RCSID("$NetBSD: target.c,v 1.14 2020/09/27 17:51:48 martin Exp $");
 #endif
 
 /*
@@ -160,6 +160,9 @@
        struct disk_partitions *parts, *inner;
        struct disk_part_info info;
 
+       if (pm == NULL)
+               return 1;
+
        if (pm == last_pm)
                return last_res;
 



Home | Main Index | Thread Index | Old Index