summaryrefslogtreecommitdiff
path: root/release/sysinstall
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1997-02-18 04:39:18 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1997-02-18 04:39:18 +0000
commitd4b8a803d26c4ab1afbe6ecbd7c55dbef07d86a4 (patch)
treee52bdb21d60b4758373c806698d619bf6dfd1120 /release/sysinstall
parent3edb5b8243e7fb70da08b26f736183343acef3f4 (diff)
Notes
Diffstat (limited to 'release/sysinstall')
-rw-r--r--release/sysinstall/menus.c6
-rw-r--r--release/sysinstall/misc.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index 15dbc7633998..aed91ae9b645 100644
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: menus.c,v 1.42.2.70 1997/02/07 04:26:31 jkh Exp $
+ * $Id: menus.c,v 1.42.2.71 1997/02/13 00:32:56 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -1060,6 +1060,10 @@ DMenu MenuConfigure = {
NULL, docBrowser },
{ "B XFree86", "Configure XFree86",
NULL, configXFree86 },
+ { "L Label", "The disk Label editor",
+ NULL, diskLabelEditor },
+ { "Partition", "The disk Partition Editor",
+ NULL, diskPartitionEditor },
{ "Exit", "Exit this menu (returning to previous)",
NULL, dmenuExit },
{ NULL } },
diff --git a/release/sysinstall/misc.c b/release/sysinstall/misc.c
index 56c697002551..30f7425cffde 100644
--- a/release/sysinstall/misc.c
+++ b/release/sysinstall/misc.c
@@ -1,7 +1,7 @@
/*
* Miscellaneous support routines..
*
- * $Id$
+ * $Id: misc.c,v 1.12.2.21 1997/02/07 04:26:38 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -320,8 +320,8 @@ Mount(char *mountp, void *dev)
return DITEM_SUCCESS;
if (*((char *)dev) != '/') {
- sprintf(device, "/mnt/dev/%s", (char *)dev);
- sprintf(mountpoint, "/mnt%s", mountp);
+ sprintf(device, "%s/dev/%s", (char *)dev, RunningAsInit ? "/mnt" : "");
+ sprintf(mountpoint, "%s%s", RunningAsInit ? "/mnt" : "", mountp);
}
else {
strcpy(device, dev);