Source-Changes-HG archive

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

[src/trunk]: src/usr.sbin/sysinst PR install/53220



details:   https://anonhg.NetBSD.org/src/rev/cb1406e2d50b
branches:  trunk
changeset: 322395:cb1406e2d50b
user:      kre <kre%NetBSD.org@localhost>
date:      Tue May 01 21:26:41 2018 +0000

description:
PR install/53220

Don't call pm_lvm_find() unless have_lvm

pm_lvm_find() assumes that data structs (lvms) has been allocated
for it to use, which doesn't happen if !have_lvm

This avoids a sysinst core dump when the lvm command is not installed
(such as when installing from the embedded RAM root filesys in an
INSTALL kernel.)

diffstat:

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

diffs (19 lines):

diff -r 2c035b2b3658 -r cb1406e2d50b usr.sbin/sysinst/partman.c
--- a/usr.sbin/sysinst/partman.c        Tue May 01 21:18:23 2018 +0000
+++ b/usr.sbin/sysinst/partman.c        Tue May 01 21:26:41 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: partman.c,v 1.19 2018/05/01 08:27:39 martin Exp $ */
+/*     $NetBSD: partman.c,v 1.20 2018/05/01 21:26:41 kre Exp $ */
 
 /*
  * Copyright 2012 Eugene Lozovoy
@@ -2609,7 +2609,8 @@
                        pm_i->found = 0;
        /* Detect all present devices */
        (void)find_disks("partman");
-       pm_lvm_find();
+       if (have_lvm)
+               pm_lvm_find();
        pm_clean();
 
        if (m == NULL || arg == NULL)



Home | Main Index | Thread Index | Old Index