Replace `return' outside of function with exit

MFC after: 3 days
X-MFC-to: stable/10
Pointy hat to: me

Catch up with head, primarily for the 1.14.4.0 firmware.

Merge ^/head r285341 through r285792.

Add support for two workarounds for known issues booting GPT in legacy mode on some hardware

For Lenovo laptops with buggy bios (x220, t420, t520):
Write the 0xee entry into the second slot in the

Add support for two workarounds for known issues booting GPT in legacy mode on some hardware

For Lenovo laptops with buggy bios (x220, t420, t520):
Write the 0xee entry into the second slot in the pmbr instead of the first

For some Dell and HP models:
The BIOS gives a warning message when booting in legacy mode from a GPT partitioned disk where the 0xee partition in the pmbr is not flagged active
For models known to have this problem, mark the pmbr active during installation

Use smbios data to identify machines known to be affected by any of the above, and offer the user the option to apply the workaround

In bsdinstall's ufs auto mode (autopart partition wizard):
Allow users to select which type of partition table to use
Keep current defaults: MBR for BIOS, GPT for UEFI
This allows users to choose GPT for legacy boot if they wish

PR: 184910
PR: 194359
Reviewed by: Michael Dexter
Approved by: marcel
MFC after: 3 days
X-MFC-With: r285594
Relnotes: yes
Sponsored by: ScaleEngine Inc.
Differential Revision: https://reviews.freebsd.org/D3091

show more ...

Make bsdinstall's zfsboot script align partitions to 4k/1m when the user requests it

PR: 195174
Reviewed by: darius
Approved by: brueffer
MFC after: 3 days
Relnotes: yes
Sponsored by: ScaleEngine I

Make bsdinstall's zfsboot script align partitions to 4k/1m when the user requests it

PR: 195174
Reviewed by: darius
Approved by: brueffer
MFC after: 3 days
Relnotes: yes
Sponsored by: ScaleEngine Inc.
Differential Revision: https://reviews.freebsd.org/D3062

show more ...

Set a mountpoint on the root of the pool so user-created datasets have a mountpoint to inherit

Reviewed by: darius
Approved by: brueffer
MFC after: 3 days
Relnotes: yes
Sponsored by: ScaleEngine Inc

Set a mountpoint on the root of the pool so user-created datasets have a mountpoint to inherit

Reviewed by: darius
Approved by: brueffer
MFC after: 3 days
Relnotes: yes
Sponsored by: ScaleEngine Inc.
Differential Revision: https://reviews.freebsd.org/D3063

show more ...

Have bsdinstall's zfsboot script make /var/audit its own dataset, so it is not part of the OS boot environment

PR: 199864
Submitted by: Jason Unovitch
Approved by: brueffer
MFC after: 3 days
Relnot

Have bsdinstall's zfsboot script make /var/audit its own dataset, so it is not part of the OS boot environment

PR: 199864
Submitted by: Jason Unovitch
Approved by: brueffer
MFC after: 3 days
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D2861

show more ...

Fix a typo in bsdinstall

A variable was misspelled resulting in chmod executing on the installer instead of on the target chroot

PR: 191402
Submitted by: Martin Simmons <martin@lispworks.com>
Appr

Fix a typo in bsdinstall

A variable was misspelled resulting in chmod executing on the installer instead of on the target chroot

PR: 191402
Submitted by: Martin Simmons <martin@lispworks.com>
Approved by: brueffer
MFC after: 3 days
Sponsored by: ScaleEngine Inc.
Differential Revision: https://reviews.freebsd.org/D3061

show more ...

Catch up with HEAD (r280229-r284686).

MFH: r282615-r283655

Sponsored by: The FreeBSD Foundation

Merge sync of head

Fix a syntax error in bsdinstall/zfsboot

Differential Revision: https://reviews.freebsd.org/D2571
Submitted by: Michael Dexter
Approved by: dteske
MFC after: 1 week
X-MFC-With: r283023, r282443
Spon

Fix a syntax error in bsdinstall/zfsboot

Differential Revision: https://reviews.freebsd.org/D2571
Submitted by: Michael Dexter
Approved by: dteske
MFC after: 1 week
X-MFC-With: r283023, r282443
Sponsored by: ScaleEngine Inc.

show more ...

bsdinstall/zfsboot: Skip adding swap lines to /etc/fstab if swap is 0 sized

Differential Revision: https://reviews.freebsd.org/D2571
Reviewed by: dim
Approved by: eadler (mentor)
Sponsored by: Scale

bsdinstall/zfsboot: Skip adding swap lines to /etc/fstab if swap is 0 sized

Differential Revision: https://reviews.freebsd.org/D2571
Reviewed by: dim
Approved by: eadler (mentor)
Sponsored by: ScaleEngine Inc.

show more ...

Merge from HEAD

MFH: r282315-r282534

Sponsored by: The FreeBSD Foundation

Add a sanity check to the swap size in zfsboot of bsdinstall
Loop until the user enters a valid size (>100mb or 0)

Differential Revision: https://reviews.freebsd.org/D2299
Reported By: Shawn Webb
Re

Add a sanity check to the swap size in zfsboot of bsdinstall
Loop until the user enters a valid size (>100mb or 0)

Differential Revision: https://reviews.freebsd.org/D2299
Reported By: Shawn Webb
Reviewed by: roberto
Approved by: brd
MFC after: 2 weeks
Sponsored by: ScaleEngine Inc.

show more ...

Merge from head

MFH: r280643-r281852

Sponsored by: The FreeBSD Foundation

Add "GELI Passphrase:" prompt to boot loader.

A new loader.conf(5) option of geom_eli_passphrase_prompt="YES" will now
allow you to enter your geli(8) root-mount credentials prior to invoking
the ke

Add "GELI Passphrase:" prompt to boot loader.

A new loader.conf(5) option of geom_eli_passphrase_prompt="YES" will now
allow you to enter your geli(8) root-mount credentials prior to invoking
the kernel.

See check-password.4th(8) for details.

Differential Revision: https://reviews.freebsd.org/D2105
Reviewed by: imp, kmoore
Discussed on: -current
MFC after: 3 days
X-MFC-to: stable/10
Relnotes: yes

show more ...

Unbreak ZFS+GELI install option.

Reported by: delphij
Submitted by: delphij
Pointy hat to: dteske (me)
MFC after: 3 days
X-MFC-to: stable/10 stable/9
X-MFC-with: r281160

Fix permissions on ZFS root encryption key (644 -> 600).

MFC after: 3 days
X-MFC-to: stable/10 stable/9
Security: CVE-2015-1415
Reported by: Pierre Kim

Merge from HEAD

Whoops! "arc commit --revision" != "arc diff --update"

Add "GELI Passphrase:" prompt to boot loader.

Summary:
Add "GELI Passphrase:" prompt to boot loader.

A new loader.conf(5) option of geom_eli_passphrase_prompt="YES" will now
allow you to enter your

Add "GELI Passphrase:" prompt to boot loader.

Summary:
Add "GELI Passphrase:" prompt to boot loader.

A new loader.conf(5) option of geom_eli_passphrase_prompt="YES" will now
allow you to enter your geli(8) root-mount credentials prior to invoking
the kernel.

See check-password.4th(8) for details.

Differential Revision: https://reviews.freebsd.org/D2105
Reviewed by: (your name[s] here)
MFC after: 3 days
X-MFC-to: stable/10
Relnotes: yes

Test Plan:
Drop a head copy of check-password.4th into /boot and then apply the patch
(only the patch to /boot/check-password.4th is required; no other changes are
required but you do have to have a HEAD copy of check-password.4th to
apply the patch).

NB: The rest of your /boot files can be up to 2 years old but no older.
NB: The test won't work unless your kernel has the following change

https://svnweb.freebsd.org/base?view=revision&revision=273489

Now, put into /boot/loader.conf:

geom_eli_passphrase_prompt="YES"

and reboot.

You should be prompted for a GELI passphrase before the menu (if enabled),
just after loading loader.conf(5).

NB: It doesn't matter if you're using GELI or not. However if you are using
GELI and a sufficiently new enough release (has SVN r273489) and you entered
the proper passphrase to mount your GELI encrypted root device(s), you should
notice that the boot process did not stop (you went from loader all the way to login).

Reviewers: cperciva, allanjude, scottl, kmoore

Subscribers: jkh, imp

Differential Revision: https://reviews.freebsd.org/D2105

show more ...

MFH: r278968-r280640

Sponsored by: The FreeBSD Foundation