From 7382b0bfa53d7efc7b4e96b6574ee3c12ca740ed Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 27 Nov 2002 19:46:18 +0000 Subject: [PATCH] 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 --- usr.sbin/sade/label.c | 2 ++ usr.sbin/sysinstall/label.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c index ba2d6552657d..7964545a50d8 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 ba2d6552657d..7964545a50d8 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);