Date: Wed, 18 Dec 2013 12:27:34 -0500 From: Allan Jude <freebsd@allanjude.com> To: FreeBSD Current <freebsd-current@freebsd.org> Cc: Devin Teske <dteske@FreeBSD.org> Subject: ZFS Boot patch Message-ID: <52B1DB06.3090305@allanjude.com>
next in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --7N8kCSntva7Do6OnUBkrXlWpiTBqcIkrO Content-Type: multipart/mixed; boundary="------------070604020903050209010108" This is a multi-part message in MIME format. --------------070604020903050209010108 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable An issue we thought we had fixed, was not actually fixed. When doing a GELI based Root-on-ZFS install, the 'bootpool' is not always properly mounted in the installed system. The lines added to loader.conf to make it use the zpool.cache file and learn of the existence of the 2nd pool are required, and have the desired effect. However, it seems that the 2nd pool is not always listed in the cache fil= e. The attached patch should fix this issue. Hopefully this can get MFCd in time for the next RC --=20 Allan Jude --------------070604020903050209010108 Content-Type: text/plain; charset=windows-1252; name="geli_zpool.cache_zfsboot.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="geli_zpool.cache_zfsboot.patch" Index: usr.sbin/bsdinstall/scripts/zfsboot =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- usr.sbin/bsdinstall/scripts/zfsboot (revision 259561) +++ usr.sbin/bsdinstall/scripts/zfsboot (working copy) @@ -1156,6 +1156,11 @@ f_eval_catch $funcname zpool "$ZPOOL_SET" \ "cachefile=3D\"$BSDINSTALL_CHROOT/boot/zfs/zpool.cache\"" = \ "$zroot_name" || return $FAILURE + if [ "$ZFSBOOT_BOOT_POOL" ]; then + f_eval_catch $funcname zpool "$ZPOOL_SET" \ + "cachefile=3D\"$BSDINSTALL_CHROOT/boot/zfs/zpool.cache\""= \ + "$bootpool_name" || return $FAILURE + fi =20 # Last, but not least... required lines for rc.conf(5)/loader.conf(5) # NOTE: We later concatenate these into their destination --------------070604020903050209010108-- --7N8kCSntva7Do6OnUBkrXlWpiTBqcIkrO Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSsdsKAAoJEJrBFpNRJZKfH6oP/jAYnxFZvRAsOTVjMurIOTE9 mAlkLb8JieC6cJ5MmYvzITdLQCOfkbVywUoNv0Q5QPAP66V/NJHygu9si/iQI9bB iYgGIpVZfC3GFiHfczJcJl4dVjAE1R2a8EaMERrC3ITvbhEaQQ0rzneiH5cJvwSx rtdEnUdgNlZf1Hhzb0mHHg+VmqmHEcJx/8i1v7w8yuU4AU2gPPlESzPqU8A6hsvV sQGTTCJ6Q9h/P4B6xJF6n4XnY4+0UX+fUTmL9zol4FEOQqs44pqLaKy/JZhf2/vv ZuKYg7gSQBAwkNe9QEHYbZKN4ldRauulCXixhMyl3gO9I0XKjzG6A/3RT3bnkbze SBXuGuboKrH5WACZruF29ghBvMtTdUfNgwOo10FLCwlSAxDBE8JmWC9MRNS01mIG lPgcAQNlnGI2Em/34JY6Yf10gXuvuguzbp3fcFRD1hxFT8GMHmCwTpA6o0/QBorx PrDjIOEUmi5STCd/hLhQNjn2yPRj99xSnfu0VCUU6A+q5TVtG7wjv3PyEjQbNwjL ZZV9GxuL25qZcF8xh0XjZhSsHz4TIg5YaJxYt2fbqVu94ky07a9GG/8hY9BZWz4n 1ZGvzGDJ6Ejj11PDCYD2r29AOsMOoL/OtREfx8hs4cmG3LE+QYtZuKrCZ4r97UVR XtRihciR44/6r/m/xJRH =94F6 -----END PGP SIGNATURE----- --7N8kCSntva7Do6OnUBkrXlWpiTBqcIkrO--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52B1DB06.3090305>