]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
MFC r256540, r256544:
authorgjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Fri, 1 Nov 2013 15:54:57 +0000 (15:54 +0000)
committergjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Fri, 1 Nov 2013 15:54:57 +0000 (15:54 +0000)
commit95c7f9bc9434e1be00b69f13a6868f1a6a9ba677
treea541c42afaaef18a8c4236933c0452a2c304da1d
parentd6cc1b2ed3bd85e2b4ed125f5a63f5152692a4cd
MFC r256540, r256544:

 r256540 (dteske):
 Add loader.conf(5) entries to import bootpool after boot when
 using full-disk encryption and ZFS.

 r256544 (dteske):
 Fix loader.conf(5) entries from r256540.

Approved by: re (hrs)
Sponsored by: The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/stable/10@257507 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
usr.sbin/bsdinstall/scripts/zfsboot