summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1997-03-08 16:17:49 +0000
committerjkh <jkh@FreeBSD.org>1997-03-08 16:17:49 +0000
commit392282ab2e2a78822abe76e13d5e87acb6294a73 (patch)
tree4aaee58914b5db30498a087c844549ee5ab7a50f /usr.sbin
parentdfdab64a1832f3d7748c4068960de8eba7a28c04 (diff)
downloadFreeBSD-src-392282ab2e2a78822abe76e13d5e87acb6294a73.zip
FreeBSD-src-392282ab2e2a78822abe76e13d5e87acb6294a73.tar.gz
YAMF22
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sade/install.c6
-rw-r--r--usr.sbin/sade/label.c4
-rw-r--r--usr.sbin/sysinstall/install.c6
-rw-r--r--usr.sbin/sysinstall/label.c4
4 files changed, 16 insertions, 4 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 7f5f6d7..1eeafe9 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: install.c,v 1.173 1997/03/07 16:39:15 jkh Exp $
+ * $Id: install.c,v 1.174 1997/03/08 12:57:43 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -561,6 +561,10 @@ installNovice(dialogMenuItem *self)
restorescr(w);
}
+ /* Now would be a good time to checkpoint the configuration data */
+ configSysconfig("/etc/sysconfig");
+ sync();
+
if (directory_exists("/usr/X11R6")) {
dialog_clear_norefresh();
if (!msgYesNo("Would you like to configure your X server at this time?"))
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 0854ab8..6449cd8 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id$
+ * $Id: label.c,v 1.68 1997/02/22 14:11:50 peter Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -427,6 +427,8 @@ print_label_chunks(void)
if (label_chunk_info[i].c->private_data
&& (label_chunk_info[i].type == PART_FILESYSTEM || label_chunk_info[i].type == PART_FAT))
mountpoint = ((PartInfo *)label_chunk_info[i].c->private_data)->mountpoint;
+ else if (label_chunk_info[i].type == PART_SWAP)
+ mountpoint = "swap";
else
mountpoint = "<none>";
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 7f5f6d7..1eeafe9 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: install.c,v 1.173 1997/03/07 16:39:15 jkh Exp $
+ * $Id: install.c,v 1.174 1997/03/08 12:57:43 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -561,6 +561,10 @@ installNovice(dialogMenuItem *self)
restorescr(w);
}
+ /* Now would be a good time to checkpoint the configuration data */
+ configSysconfig("/etc/sysconfig");
+ sync();
+
if (directory_exists("/usr/X11R6")) {
dialog_clear_norefresh();
if (!msgYesNo("Would you like to configure your X server at this time?"))
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index 0854ab8..6449cd8 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id$
+ * $Id: label.c,v 1.68 1997/02/22 14:11:50 peter Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -427,6 +427,8 @@ print_label_chunks(void)
if (label_chunk_info[i].c->private_data
&& (label_chunk_info[i].type == PART_FILESYSTEM || label_chunk_info[i].type == PART_FAT))
mountpoint = ((PartInfo *)label_chunk_info[i].c->private_data)->mountpoint;
+ else if (label_chunk_info[i].type == PART_SWAP)
+ mountpoint = "swap";
else
mountpoint = "<none>";
OpenPOWER on IntegriCloud