d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore hostid check for root-on-ZFS configurations. Making hostid available

Browse Source 
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:
pjd 2007-04-17 17:57:34 +00:00
parent f0a8f88e53
commit 934b1fc38b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
View File

@ -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;

6
sys/contrib/opensolaris/uts/common/fs/zfs/spa.c
View File

@ -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;