Module Name:    src
Committed By:   martin
Date:           Sun Sep 27 17:51:49 UTC 2020

Modified Files:
        src/usr.sbin/sysinst: target.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/sysinst/target.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/sysinst/target.c
diff -u src/usr.sbin/sysinst/target.c:1.13 src/usr.sbin/sysinst/target.c:1.14
--- src/usr.sbin/sysinst/target.c:1.13	Wed Feb 19 18:08:03 2020
+++ src/usr.sbin/sysinst/target.c	Sun Sep 27 17:51:48 2020
@@ -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 @@ target_already_root(void)
 	struct disk_partitions *parts, *inner;
 	struct disk_part_info info;
 
+	if (pm == NULL)
+		return 1;
+
 	if (pm == last_pm)
 		return last_res;
 

Reply via email to