installer: Turn off soft updates for /boot in the UFS install. master
authorSascha Wildner <saw@online.de>
Sun, 26 Feb 2017 03:51:04 +0000 (04:51 +0100)
committerSascha Wildner <saw@online.de>
Sun, 26 Feb 2017 03:51:04 +0000 (04:51 +0100)
This was missed when we gave the UFS install a separate /boot partition.

Reported-by: ozmage
usr.sbin/installer/dfuibe_installer/fn_subpart_ufs.c

index 19e2f0f..ad68b30 100644 (file)
@@ -525,7 +525,7 @@ save_subpartition_selections(struct dfui_response *r, struct i_fn_args *a)
                        bsize = atol(dfui_dataset_get_value(ds, "bsize"));
                        tmpfsbacked = (strcmp(dfui_dataset_get_value(ds, "tmpfsbacked"), "Y") == 0);
                } else {
-                       softupdates = (strcmp(mountpoint, "/") == 0 ? 0 : 1);
+                       softupdates = (strcmp(mountpoint, "/boot") == 0 ? 0 : 1);
                        tmpfsbacked = 0;
                        fsize = -1;
                        bsize = -1;
@@ -596,7 +596,7 @@ populate_create_subpartitions_form(struct dfui_form *f, struct i_fn_args *a)
                        dfui_dataset_celldata_add(ds, "encrypted", "N");
                        if (expert) {
                                dfui_dataset_celldata_add(ds, "softupdates",
-                                   strcmp(def_mountpt[mtpt], "/") != 0 ? "Y" : "N");
+                                   strcmp(def_mountpt[mtpt], "/boot") != 0 ? "Y" : "N");
                                dfui_dataset_celldata_add(ds, "tmpfsbacked",
                                    "N");
                                dfui_dataset_celldata_add(ds, "fsize",