summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2002-11-27 19:46:18 +0000
committerjhb <jhb@FreeBSD.org>2002-11-27 19:46:18 +0000
commitcae9fe85dffeaad3fdd48cdc60fd6679210ed9e3 (patch)
tree58e5057b5abc3d4b12401e4e19c4e632ec87c5b5 /usr.sbin
parentf5ed1728818b5099b59fb4f9f1a57bc56f9120d1 (diff)
downloadFreeBSD-src-cae9fe85dffeaad3fdd48cdc60fd6679210ed9e3.zip
FreeBSD-src-cae9fe85dffeaad3fdd48cdc60fd6679210ed9e3.tar.gz
If the user choose to Undo everything in the label editor, only run the
fdisk editor if WITH_SLICES. Before this on arch's that didn't support slices such as alpha and sparc64 you would drop into the fdisk editor after doing an Undo in the label editor. Approved by: re
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sade/label.c2
-rw-r--r--usr.sbin/sysinstall/label.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index ba2d655..7964545 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -1085,7 +1085,9 @@ diskLabel(Device *dev)
else if ((d = Open_Disk(devs[i]->name)) != NULL) {
Free_Disk(devs[i]->private);
devs[i]->private = d;
+#ifdef WITH_SLICES
diskPartition(devs[i]);
+#endif
}
}
record_label_chunks(devs, dev);
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index ba2d655..7964545 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -1085,7 +1085,9 @@ diskLabel(Device *dev)
else if ((d = Open_Disk(devs[i]->name)) != NULL) {
Free_Disk(devs[i]->private);
devs[i]->private = d;
+#ifdef WITH_SLICES
diskPartition(devs[i]);
+#endif
}
}
record_label_chunks(devs, dev);
OpenPOWER on IntegriCloud