Ignore hostid check for root-on-ZFS configurations. Making hostid available
before the root is mounted is tricky and having it in /boot/ is not really desire. Reported by: Zephiris <zephiris@gmail.com>
This commit is contained in:
parent
c859cda5eb
commit
39db4c6e0f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=168821
@ -598,8 +598,12 @@ spa_load(spa_t *spa, nvlist_t *config, spa_load_state_t state, int mosconfig)
|
||||
goto out;
|
||||
}
|
||||
|
||||
/*
|
||||
* hostid is set after the root file system is mounted, so
|
||||
* ignore the check until it's done.
|
||||
*/
|
||||
if (nvlist_lookup_uint64(newconfig, ZPOOL_CONFIG_HOSTID,
|
||||
&hostid) == 0) {
|
||||
&hostid) == 0 && root_mounted()) {
|
||||
char *hostname;
|
||||
unsigned long myhostid = 0;
|
||||
|
||||
|
@ -598,8 +598,12 @@ spa_load(spa_t *spa, nvlist_t *config, spa_load_state_t state, int mosconfig)
|
||||
goto out;
|
||||
}
|
||||
|
||||
/*
|
||||
* hostid is set after the root file system is mounted, so
|
||||
* ignore the check until it's done.
|
||||
*/
|
||||
if (nvlist_lookup_uint64(newconfig, ZPOOL_CONFIG_HOSTID,
|
||||
&hostid) == 0) {
|
||||
&hostid) == 0 && root_mounted()) {
|
||||
char *hostname;
|
||||
unsigned long myhostid = 0;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user