Source-Changes-HG archive

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

[src/netbsd-7]: src/usr.sbin/sysinst Pull up following revision(s) (requested...



details:   https://anonhg.NetBSD.org/src/rev/78d269510ca4
branches:  netbsd-7
changeset: 799673:78d269510ca4
user:      riz <riz%NetBSD.org@localhost>
date:      Sun Nov 08 00:21:34 2015 +0000

description:
Pull up following revision(s) (requested by martin in ticket #1008):
        usr.sbin/sysinst/target.c: revision 1.3
PR 50342: if there is no current partition manage, assume we are running
from an already installed system.

diffstat:

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

diffs (28 lines):

diff -r b030b246081b -r 78d269510ca4 usr.sbin/sysinst/target.c
--- a/usr.sbin/sysinst/target.c Sat Nov 07 16:43:38 2015 +0000
+++ b/usr.sbin/sysinst/target.c Sun Nov 08 00:21:34 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: target.c,v 1.2 2014/08/03 16:09:38 martin Exp $        */
+/*     $NetBSD: target.c,v 1.2.4.1 2015/11/08 00:21:34 riz 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.2 2014/08/03 16:09:38 martin Exp $");
+__RCSID("$NetBSD: target.c,v 1.2.4.1 2015/11/08 00:21:34 riz Exp $");
 #endif
 
 /*
@@ -153,6 +153,9 @@
 target_already_root(void)
 {
 
+       if (pm == NULL)
+               return TRUE;
+
        if (strcmp(pm->diskdev, "") == 0)
                /* No root partition was ever selected.
                 * Assume that the currently mounted one should be used



Home | Main Index | Thread Index | Old Index