]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
projects / FreeBSD / stable / 10.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a11b308) | patch
MFC: r293001
authorallanjude <allanjude@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Wed, 13 Jan 2016 01:50:02 +0000 (01:50 +0000)
committerallanjude <allanjude@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Wed, 13 Jan 2016 01:50:02 +0000 (01:50 +0000)
commit7a2d63affbe9011b0fdcd9cc95447db84192f121
treefeae895cdd35fc83efbdb3a5e6ead7ec7dbf874ftree | snapshot
parenta11b308ae06479050908481579f8fe8250fcaa6acommit | diff
MFC: r293001
  Introduce the ZFS Boot Environments menu to the loader menu

MFC: r293414
  Add ZFS Boot Environments menu to userboot

MFC: r293454
  Only call init_zfs_bootenv when the system is booted with ZFS

MFC: r293612
  Fix calling init_zfs_bootenv to early, resulting in empty ZFS BE menu

Relnotes: yes
Sponsored by: ScaleEngine Inc.

git-svn-id: svn://svn.freebsd.org/base/stable/10@293802 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
sys/boot/forth/loader.conf diff | blob | history
sys/boot/forth/menu-commands.4th diff | blob | history
sys/boot/forth/menu.rc diff | blob | history
sys/boot/forth/support.4th diff | blob | history
sys/boot/i386/loader/main.c diff | blob | history
sys/boot/userboot/userboot/main.c diff | blob | history
sys/boot/zfs/libzfs.h diff | blob | history
sys/boot/zfs/zfs.c diff | blob | history
sys/boot/zfs/zfsimpl.c diff | blob | history
10-STABLE