c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-18 02:20:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

FreeBSD boot code reminder after zpool upgrade

Browse Source 
There used to be a warning after upgrading a zpool in FreeBSD, so users
won't forget to update the boot loader that pool is booted from.

This change brings this warning back, but only if the bootfs property
is set on the pool, which should be sufficient for the vast majority of
FreeBSD installations. People running something custom are most likely
aware of what to do after an upgrade in their specific environment.

Functionality is implemented in an OS specific helper function.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Co-authored-by: Michael Gmelin <grembo@FreeBSD.org>
Signed-off-by: Michael Gmelin <grembo@FreeBSD.org>
Closes #12099
Closes #12104
This commit is contained in:
grembo 2021-06-01 23:03:49 +02:00 committed by Brian Behlendorf
parent a0c055cfd3
commit 1fb18c4bde
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/zpool/os/freebsd/zpool_vdev_os.c
View File

@ -101,3 +101,18 @@ check_sector_size_database(char *path, int *sector_size)
{ {
return (0); return (0);
} }
void
after_zpool_upgrade(zpool_handle_t *zhp)
{
char bootfs[ZPOOL_MAXPROPLEN];
if (zpool_get_prop(zhp, ZPOOL_PROP_BOOTFS, bootfs,
sizeof (bootfs), NULL, B_FALSE) == 0 &&
strcmp(bootfs, "-") != 0) {
(void) printf(gettext("Pool '%s' has the bootfs "
"property set, you might need to update\nthe boot "
"code. See gptzfsboot(8) and loader.efi(8) for "
"details.\n"), zpool_get_name(zhp));
}
}

5
cmd/zpool/os/linux/zpool_vdev_os.c
View File

@ -405,3 +405,8 @@ check_device(const char *path, boolean_t force,
return (error); return (error);
} }
void
after_zpool_upgrade(zpool_handle_t *zhp)
{
}

22
cmd/zpool/zpool_main.c
View File

@ -8858,7 +8858,7 @@ upgrade_cb(zpool_handle_t *zhp, void *arg)
upgrade_cbdata_t *cbp = arg; upgrade_cbdata_t *cbp = arg;
nvlist_t *config; nvlist_t *config;
uint64_t version; uint64_t version;
boolean_t printnl = B_FALSE; boolean_t modified_pool = B_FALSE;
int ret; int ret;
config = zpool_get_config(zhp, NULL); config = zpool_get_config(zhp, NULL);
@ -8872,7 +8872,7 @@ upgrade_cb(zpool_handle_t *zhp, void *arg)
ret = upgrade_version(zhp, cbp->cb_version); ret = upgrade_version(zhp, cbp->cb_version);
if (ret != 0) if (ret != 0)
return (ret); return (ret);
printnl = B_TRUE; modified_pool = B_TRUE;
/* /*
* If they did "zpool upgrade -a", then we could * If they did "zpool upgrade -a", then we could
@ -8892,12 +8892,13 @@ upgrade_cb(zpool_handle_t *zhp, void *arg)
if (count > 0) { if (count > 0) {
cbp->cb_first = B_FALSE; cbp->cb_first = B_FALSE;
printnl = B_TRUE; modified_pool = B_TRUE;
} }
} }
if (printnl) { if (modified_pool) {
(void) printf(gettext("\n")); (void) printf("\n");
(void) after_zpool_upgrade(zhp);
} }
return (0); return (0);
@ -9010,7 +9011,7 @@ upgrade_list_disabled_cb(zpool_handle_t *zhp, void *arg)
static int static int
upgrade_one(zpool_handle_t *zhp, void *data) upgrade_one(zpool_handle_t *zhp, void *data)
{ {
boolean_t printnl = B_FALSE; boolean_t modified_pool = B_FALSE;
upgrade_cbdata_t *cbp = data; upgrade_cbdata_t *cbp = data;
uint64_t cur_version; uint64_t cur_version;
int ret; int ret;
@ -9038,7 +9039,7 @@ upgrade_one(zpool_handle_t *zhp, void *data)
} }
if (cur_version != cbp->cb_version) { if (cur_version != cbp->cb_version) {
printnl = B_TRUE; modified_pool = B_TRUE;
ret = upgrade_version(zhp, cbp->cb_version); ret = upgrade_version(zhp, cbp->cb_version);
if (ret != 0) if (ret != 0)
return (ret); return (ret);
@ -9051,7 +9052,7 @@ upgrade_one(zpool_handle_t *zhp, void *data)
return (ret); return (ret);
if (count != 0) { if (count != 0) {
printnl = B_TRUE; modified_pool = B_TRUE;
} else if (cur_version == SPA_VERSION) { } else if (cur_version == SPA_VERSION) {
(void) printf(gettext("Pool '%s' already has all " (void) printf(gettext("Pool '%s' already has all "
"supported and requested features enabled.\n"), "supported and requested features enabled.\n"),
@ -9059,8 +9060,9 @@ upgrade_one(zpool_handle_t *zhp, void *data)
} }
} }
if (printnl) { if (modified_pool) {
(void) printf(gettext("\n")); (void) printf("\n");
(void) after_zpool_upgrade(zhp);
} }
return (0); return (0);

1
cmd/zpool/zpool_util.h
View File

@ -129,6 +129,7 @@ int check_device(const char *path, boolean_t force,
boolean_t check_sector_size_database(char *path, int *sector_size); boolean_t check_sector_size_database(char *path, int *sector_size);
void vdev_error(const char *fmt, ...); void vdev_error(const char *fmt, ...);
int check_file(const char *file, boolean_t force, boolean_t isspare); int check_file(const char *file, boolean_t force, boolean_t isspare);
void after_zpool_upgrade(zpool_handle_t *zhp);
#ifdef __cplusplus #ifdef __cplusplus
} }