summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--release/sysinstall/disks.c3
-rw-r--r--release/sysinstall/label.c8
-rw-r--r--usr.sbin/sade/disks.c3
-rw-r--r--usr.sbin/sade/label.c8
-rw-r--r--usr.sbin/sysinstall/disks.c3
-rw-r--r--usr.sbin/sysinstall/label.c8
6 files changed, 15 insertions, 18 deletions
diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c
index abc5d4d..21dbe87 100644
--- a/release/sysinstall/disks.c
+++ b/release/sysinstall/disks.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: disks.c,v 1.53 1996/07/02 01:03:33 jkh Exp $
+ * $Id: disks.c,v 1.54 1996/07/05 08:35:52 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -349,6 +349,7 @@ diskPartition(Device *dev, Disk *d)
Free_Disk(dev->private);
dev->private = d;
variable_unset(DISK_PARTITIONED);
+ variable_unset(DISK_LABELLED);
record_chunks(d);
break;
diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c
index 09c5a56..ac59ee1 100644
--- a/release/sysinstall/label.c
+++ b/release/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: label.c,v 1.49 1996/06/08 08:01:51 jkh Exp $
+ * $Id: label.c,v 1.50 1996/06/08 09:08:41 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -120,10 +120,8 @@ diskLabelCommit(dialogMenuItem *self)
int i;
/* Already done? */
- if ((cp = variable_get(DISK_LABELLED)) && strcmp(cp, "yes")) {
- variable_set2(DISK_PARTITIONED, "yes");
+ if ((cp = variable_get(DISK_LABELLED)) && strcmp(cp, "yes"))
i = DITEM_SUCCESS;
- }
else if (!cp) {
msgConfirm("You must assign disk labels before this option can be used.");
i = DITEM_FAILURE;
@@ -811,6 +809,7 @@ diskLabel(char *str)
if (msgYesNo("Are you SURE you want to Undo everything?"))
break;
variable_unset(DISK_PARTITIONED);
+ variable_unset(DISK_LABELLED);
for (i = 0; devs[i]; i++) {
Disk *d;
@@ -822,7 +821,6 @@ diskLabel(char *str)
diskPartition(devs[i], d);
}
}
- variable_unset(DISK_LABELLED);
record_label_chunks(devs);
break;
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c
index abc5d4d..21dbe87 100644
--- a/usr.sbin/sade/disks.c
+++ b/usr.sbin/sade/disks.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: disks.c,v 1.53 1996/07/02 01:03:33 jkh Exp $
+ * $Id: disks.c,v 1.54 1996/07/05 08:35:52 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -349,6 +349,7 @@ diskPartition(Device *dev, Disk *d)
Free_Disk(dev->private);
dev->private = d;
variable_unset(DISK_PARTITIONED);
+ variable_unset(DISK_LABELLED);
record_chunks(d);
break;
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 09c5a56..ac59ee1 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: label.c,v 1.49 1996/06/08 08:01:51 jkh Exp $
+ * $Id: label.c,v 1.50 1996/06/08 09:08:41 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -120,10 +120,8 @@ diskLabelCommit(dialogMenuItem *self)
int i;
/* Already done? */
- if ((cp = variable_get(DISK_LABELLED)) && strcmp(cp, "yes")) {
- variable_set2(DISK_PARTITIONED, "yes");
+ if ((cp = variable_get(DISK_LABELLED)) && strcmp(cp, "yes"))
i = DITEM_SUCCESS;
- }
else if (!cp) {
msgConfirm("You must assign disk labels before this option can be used.");
i = DITEM_FAILURE;
@@ -811,6 +809,7 @@ diskLabel(char *str)
if (msgYesNo("Are you SURE you want to Undo everything?"))
break;
variable_unset(DISK_PARTITIONED);
+ variable_unset(DISK_LABELLED);
for (i = 0; devs[i]; i++) {
Disk *d;
@@ -822,7 +821,6 @@ diskLabel(char *str)
diskPartition(devs[i], d);
}
}
- variable_unset(DISK_LABELLED);
record_label_chunks(devs);
break;
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index abc5d4d..21dbe87 100644
--- a/usr.sbin/sysinstall/disks.c
+++ b/usr.sbin/sysinstall/disks.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: disks.c,v 1.53 1996/07/02 01:03:33 jkh Exp $
+ * $Id: disks.c,v 1.54 1996/07/05 08:35:52 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -349,6 +349,7 @@ diskPartition(Device *dev, Disk *d)
Free_Disk(dev->private);
dev->private = d;
variable_unset(DISK_PARTITIONED);
+ variable_unset(DISK_LABELLED);
record_chunks(d);
break;
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index 09c5a56..ac59ee1 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: label.c,v 1.49 1996/06/08 08:01:51 jkh Exp $
+ * $Id: label.c,v 1.50 1996/06/08 09:08:41 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -120,10 +120,8 @@ diskLabelCommit(dialogMenuItem *self)
int i;
/* Already done? */
- if ((cp = variable_get(DISK_LABELLED)) && strcmp(cp, "yes")) {
- variable_set2(DISK_PARTITIONED, "yes");
+ if ((cp = variable_get(DISK_LABELLED)) && strcmp(cp, "yes"))
i = DITEM_SUCCESS;
- }
else if (!cp) {
msgConfirm("You must assign disk labels before this option can be used.");
i = DITEM_FAILURE;
@@ -811,6 +809,7 @@ diskLabel(char *str)
if (msgYesNo("Are you SURE you want to Undo everything?"))
break;
variable_unset(DISK_PARTITIONED);
+ variable_unset(DISK_LABELLED);
for (i = 0; devs[i]; i++) {
Disk *d;
@@ -822,7 +821,6 @@ diskLabel(char *str)
diskPartition(devs[i], d);
}
}
- variable_unset(DISK_LABELLED);
record_label_chunks(devs);
break;
OpenPOWER on IntegriCloud