From 683024075303474c028e59451892b3e04dc090eb Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Mon, 6 Aug 2018 16:15:11 +0300 Subject: [PATCH] loader: rename zfsloader to loader illumos bug# 9668 --- share/man/man5/Makefile | 1 - share/man/man5/beastie.4th.5 | 6 +- share/man/man5/brand.4th.5 | 6 +- share/man/man5/check-password.4th.5 | 6 +- share/man/man5/color.4th.5 | 6 +- share/man/man5/delay.4th.5 | 6 +- share/man/man5/gptzfsboot.5 | 14 ++-- share/man/man5/loader.4th.5 | 4 +- share/man/man5/loader.5 | 44 +++++++++- share/man/man5/menu.4th.5 | 6 +- share/man/man5/menusets.4th.5 | 6 +- share/man/man5/version.4th.5 | 6 +- share/man/man5/zfsloader.5 | 100 ----------------------- share/man/man8/boot.8 | 4 +- share/man/man8/installboot.8 | 6 +- usr/src/boot/Makefile.version | 2 +- usr/src/boot/sys/boot/common/Makefile | 10 --- usr/src/boot/sys/boot/common/paths.h | 5 +- usr/src/boot/sys/boot/efi/loader/Makefile.common | 8 +- usr/src/boot/sys/boot/i386/cdboot/cdboot.S | 4 +- usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c | 14 +++- usr/src/boot/sys/boot/i386/loader/Makefile | 7 +- usr/src/boot/sys/boot/i386/pxeldr/Makefile | 2 +- usr/src/boot/sys/boot/sparc64/Makefile | 2 +- usr/src/boot/sys/boot/sparc64/loader/Makefile | 2 +- usr/src/boot/sys/boot/sparc64/zfsloader/Makefile | 9 -- usr/src/pkg/manifests/system-boot-loader.mf | 3 +- 27 files changed, 103 insertions(+), 186 deletions(-) delete mode 100644 share/man/man5/zfsloader.5 delete mode 100644 usr/src/boot/sys/boot/common/Makefile delete mode 100644 usr/src/boot/sys/boot/sparc64/zfsloader/Makefile diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index ae79f279ab..760e4bf156 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -99,7 +99,6 @@ MAN = Intro.5 \ threads.5 \ timerfd.5 \ version.4th.5 \ - zfsloader.5 \ zones.5 \ zpool-features.5 diff --git a/share/man/man5/beastie.4th.5 b/share/man/man5/beastie.4th.5 index c9ac2e6dd3..4c9e7812e6 100644 --- a/share/man/man5/beastie.4th.5 +++ b/share/man/man5/beastie.4th.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Apr 22, 2017 +.Dd July 20, 2018 .Dt BEASTIE.4TH 5 .Os .Sh NAME @@ -115,9 +115,9 @@ The default is to not delay when loading the menu. .El .Sh FILES .Bl -tag -width /boot/forth/loader.4th -compact -.It Pa /boot/zfsloader +.It Pa /boot/loader The -.Xr zfsloader 5 . +.Xr loader 5 . .It Pa /boot/forth/beastie.4th .Nm itself. diff --git a/share/man/man5/brand.4th.5 b/share/man/man5/brand.4th.5 index 467a3075b2..77d6b64492 100644 --- a/share/man/man5/brand.4th.5 +++ b/share/man/man5/brand.4th.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Apr 22, 2017 +.Dd July 20, 2018 .Dt BRAND.4TH 5 .Os .Sh NAME @@ -93,9 +93,9 @@ Default is 1. .El .Sh FILES .Bl -tag -width /boot/forth/loader.4th -compact -.It Pa /boot/zfsloader +.It Pa /boot/loader The -.Xr zfsloader 5 . +.Xr loader 5 . .It Pa /boot/forth/brand.4th .Nm itself. diff --git a/share/man/man5/check-password.4th.5 b/share/man/man5/check-password.4th.5 index 3446df9799..56e995c3be 100644 --- a/share/man/man5/check-password.4th.5 +++ b/share/man/man5/check-password.4th.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Apr 22, 2017 +.Dd July 20, 2018 .Dt CHECK-PASSWORD.4TH 5 .Os .Sh NAME @@ -90,9 +90,9 @@ before the user is allowed to visit the boot menu. .El .Sh FILES .Bl -tag -width /boot/forth/check-password.4th -compact -.It Pa /boot/zfsloader +.It Pa /boot/loader The -.Xr zfsloader 5 . +.Xr loader 5 . .It Pa /boot/forth/check-password.4th .Nm itself. diff --git a/share/man/man5/color.4th.5 b/share/man/man5/color.4th.5 index 7031034d3d..c156fedd23 100644 --- a/share/man/man5/color.4th.5 +++ b/share/man/man5/color.4th.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Apr 22, 2017 +.Dd July 20, 2018 .Dt COLOR.4TH 5 .Os .Sh NAME @@ -78,9 +78,9 @@ to return FALSE, indicating to many modules that color should not be used. .El .Sh FILES .Bl -tag -width /boot/forth/loader.4th -compact -.It Pa /boot/zfsloader +.It Pa /boot/loader The -.Xr zfsloader 5 . +.Xr loader 5 . .It Pa /boot/forth/color.4th .Nm itself. diff --git a/share/man/man5/delay.4th.5 b/share/man/man5/delay.4th.5 index 4c6da7071d..1c1b897bcd 100644 --- a/share/man/man5/delay.4th.5 +++ b/share/man/man5/delay.4th.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Apr 22, 2017 +.Dd July 20, 2018 .Dt DELAY.4TH 5 .Os .Sh NAME @@ -85,9 +85,9 @@ to print a continuous series of dots during the delay duration. .El .Sh FILES .Bl -tag -width /boot/forth/loader.4th -compact -.It Pa /boot/zfsloader +.It Pa /boot/loader The -.Xr zfsloader 5 . +.Xr loader 5 . .It Pa /boot/forth/delay.4th .Nm itself. diff --git a/share/man/man5/gptzfsboot.5 b/share/man/man5/gptzfsboot.5 index 724cfe5963..10ac136dbe 100644 --- a/share/man/man5/gptzfsboot.5 +++ b/share/man/man5/gptzfsboot.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Apr 21, 2017 +.Dd July 20, 2018 .Dt GPTZFSBOOT 5 .Os .Sh NAME @@ -77,14 +77,14 @@ If the .Cm bootfs property is not set, then the root filesystem of the pool is used as the default. -.Xr zfsloader 5 +.Xr loader 5 is loaded from the boot filesystem. If .Pa /boot/config is present in the boot filesystem, boot options are read from it. .Pp The ZFS GUIDs of the boot pool and boot file system are made available to -.Xr zfsloader 5 . +.Xr loader 5 . .Ss USAGE Normally .Nm @@ -95,7 +95,7 @@ interact with through a prompt. .Pp The filesystem specification and the path to -.Xr zfsloader 5 +.Xr loader 5 is specified as .Pp .Sm off @@ -105,7 +105,7 @@ is specified as Both the filesystem and the path can be specified. If only a path is specified, then the default filesystem is used. If only a pool and filesystem are specified, then -.Pa /boot/zfsloader +.Pa /boot/loader is used as a path. .Pp Additionally, the @@ -121,7 +121,7 @@ The output format for ZFS pools is similar to that of .Pp The configured or automatically determined ZFS boot filesystem is stored in the -.Xr zfsloader 5 +.Xr loader 5 .Cm loaddev variable, and also set as the initial value of the .Cm currdev @@ -154,4 +154,4 @@ installboot /boot/pmbr /boot/gptzfsboot /dev/rdsk/c0t0d0s0 .Xr installboot 8 , .Xr zpool 8 , .Xr loader 5 , -.Xr zfsloader 5 +.Xr loader 5 diff --git a/share/man/man5/loader.4th.5 b/share/man/man5/loader.4th.5 index 0e6dd01413..4197019a59 100644 --- a/share/man/man5/loader.4th.5 +++ b/share/man/man5/loader.4th.5 @@ -171,9 +171,9 @@ silently returns without error. .El .Sh FILES .Bl -tag -width /boot/forth/loader.4th -compact -.It Pa /boot/zfsloader +.It Pa /boot/loader The -.Xr zfsloader 5 . +.Xr loader 5 . .It Pa /boot/forth/loader.4th .Nm itself. diff --git a/share/man/man5/loader.5 b/share/man/man5/loader.5 index db3648daa6..b954897adc 100644 --- a/share/man/man5/loader.5 +++ b/share/man/man5/loader.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Apr 20, 2017 +.Dd July 24, 2018 .Dt LOADER 5 .Os .Sh NAME @@ -38,7 +38,7 @@ The actual name for the stage depends on the platform. On IA32 (i386) architectures with BIOS firmware, it is a .Pa BTX client and named -.Nm zfsloader . +.Nm loader . It is linked statically to libstand and usually located in the directory .Pa /boot . .Pp @@ -250,9 +250,13 @@ is specified, file sizes will be shown too. .Pp .It Ic lsdev Op Fl v Lists all of the devices from which it may be possible to load modules. +In addition to disks and partitions, ZFS pools are also listed. If .Fl v is specified, more details are printed. +For ZFS pools the output resembles +.Nm zpool Cm status +output. .Pp .It Ic lsmod Op Fl v Displays loaded modules. @@ -260,6 +264,14 @@ If .Fl v is specified, more details are shown. .Pp +.It Ic lszfs Ar filesystem +A ZFS extended command that can be used to explore the ZFS filesystem +hierarchy in a pool. +Lists the immediate children of the +.Ar filesystem . +The filesystem hierarchy is rooted at a filesystem with the same name +as the pool. +.Pp .It Ic more Ar file Op Ar Display the files specified, with a pause at each .Va LINES @@ -304,6 +316,19 @@ from the environment. .It Ic \&? Lists available commands. .El +.Ss ZFS Features +.Nm +supports the following format for specifying ZFS filesystems which +can be used wherever +.Nm +refers to a device specification: +.Pp +.Ar zfs:pool/filesystem: +.Pp +where +.Pa pool/filesystem +is a ZFS filesystem name as described in +.Xr zfs 1M . .Ss Builtin Environment Variables The .Nm @@ -733,7 +758,7 @@ Extra builtin-like words. .It Pa /boot/forth/support.4th .Pa loader.conf processing words. -.It Pa /boot/zfsloader +.It Pa /boot/loader .Nm itself. .El @@ -751,6 +776,19 @@ load /platform/i86pc/kernel/amd64/unix load -t rootfs /platform/i86pc/amd64/boot_archive autoboot 5 .Ed +.Pp +Set the default device used for loading a kernel from a ZFS filesystem: +.Bd -literal -offset indent +set currdev=zfs:rpool/ROOT/knowngood: +.Ed +.Sh NOTES +Although setting the +.Va currdev +as shown in the example above is supported, it is advisable to use loader +beadm command or boot environment menu instead. +The reason is, the beadm or menu selection will also instruct loader to clean up +the currently set configuration and load configuration from the new boot +environment. .Sh SEE ALSO .Xr boot 8 , .Xr loader.conf 4 diff --git a/share/man/man5/menu.4th.5 b/share/man/man5/menu.4th.5 index 398a57fe3f..8cff5fbb5b 100644 --- a/share/man/man5/menu.4th.5 +++ b/share/man/man5/menu.4th.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Apr 22, 2017 +.Dd July 20, 2018 .Dt MENU.4TH 5 .Os .Sh NAME @@ -273,9 +273,9 @@ above, use any number between 1 through 9. Sorry, double-digits are not currently supported. .Sh FILES .Bl -tag -width /boot/forth/loader.4th -compact -.It Pa /boot/zfsloader +.It Pa /boot/loader The -.Xr zfsloader 5 . +.Xr loader 5 . .It Pa /boot/forth/menu.4th .Nm itself. diff --git a/share/man/man5/menusets.4th.5 b/share/man/man5/menusets.4th.5 index b2584e2030..14720a8d09 100644 --- a/share/man/man5/menusets.4th.5 +++ b/share/man/man5/menusets.4th.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Apr 22, 2017 +.Dd July 20, 2018 .Dt MENUSETS.4TH 5 .Os .Sh NAME @@ -304,9 +304,9 @@ For all values of above, use any number between 1 and 65535. .Sh FILES .Bl -tag -width /boot/menu-commands.4th -compact -.It Pa /boot/zfsloader +.It Pa /boot/loader The -.Xr zfsloader 5 . +.Xr loader 5 . .It Pa /boot/forth/menu.4th Dynamic menu module. .It Pa /boot/forth/menu-commands.4th diff --git a/share/man/man5/version.4th.5 b/share/man/man5/version.4th.5 index 556e04ab7a..3082e01bf7 100644 --- a/share/man/man5/version.4th.5 +++ b/share/man/man5/version.4th.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Apr 22, 2017 +.Dd July 20, 2018 .Dt VERSION.4TH 5 .Os .Sh NAME @@ -90,9 +90,9 @@ causes the version to be printed without color .El .Sh FILES .Bl -tag -width /boot/version.4th -compact -.It Pa /boot/zfsloader +.It Pa /boot/loader The -.Xr zfsloader 5 . +.Xr loader 5 . .It Pa /boot/forth/version.4th .Nm itself. diff --git a/share/man/man5/zfsloader.5 b/share/man/man5/zfsloader.5 deleted file mode 100644 index eb28c34464..0000000000 --- a/share/man/man5/zfsloader.5 +++ /dev/null @@ -1,100 +0,0 @@ -.\" Copyright (c) 2014 Andriy Gapon -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd Apr 20, 2017 -.Dt ZFSLOADER 5 -.Os -.Sh NAME -.Nm zfsloader -.Nd kernel bootstrapping final stage -.Sh DESCRIPTION -.Nm -is an extended variant of -.Xr loader 5 -with added support for booting from ZFS. -This document describes only differences from -.Xr loader 5 . -.Ss ZFS Features -.Nm -supports the following format for specifying ZFS filesystems which -can be used wherever -.Xr loader 5 -refers to a device specification: -.Pp -.Ar zfs:pool/filesystem: -.Pp -where -.Pa pool/filesystem -is a ZFS filesystem name as described in -.Xr zfs 8 . -.Pp -If the variable -.Va fstype -is not set, but -.Va currdev -refers to a ZFS filesystem, then -.Nm -will instruct kernel to use that filesystem as the root filesystem. -.Ss ZFS Command Extensions -.Bl -tag -width Ds -compact -.It Ic lsdev Op Fl v -Lists ZFS pools in addition to disks and partitions. -Adding -.Fl v -shows more ZFS pool details in a format that resembles -.Nm zpool Cm status -output. -.Pp -.It Ic lszfs Ar filesystem -A ZFS extended command that can be used to explore the ZFS filesystem -hierarchy in a pool. -Lists the immediate children of the -.Ar filesystem . -The filesystem hierarchy is rooted at a filesystem with the same name -as the pool. -.El -.Sh FILES -.Bl -tag -width /boot/zfsloader -compact -.It Pa /boot/zfsloader -.Nm -itself. -.El -.Sh EXAMPLES -Set the default device used for loading a kernel from a ZFS filesystem: -.Bd -literal -offset indent -set currdev=zfs:rpool/ROOT/knowngood: -.Ed -.Sh SEE ALSO -.Xr zfs 8 , -.Xr zpool 8 , -.Xr gptzfsboot 5 , -.Xr loader 5 -.Sh NOTES -Although setting the -.Va currdev -as shown in the example above is supported, it is advisable to use loader -beadm command or boot environment menu instead. -The reason is, the beadm or menu selection will also instruct loader to clean up -the currently set configuration and load configuration from the new boot -environment. diff --git a/share/man/man8/boot.8 b/share/man/man8/boot.8 index 966938ec64..f0f729e844 100644 --- a/share/man/man8/boot.8 +++ b/share/man/man8/boot.8 @@ -7,7 +7,7 @@ .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH BOOT 8 "Feb 07, 2018" +.TH BOOT 8 "Jul 20, 2018" .SH NAME boot \- start the system kernel or a standalone program .SH SYNOPSIS @@ -862,7 +862,7 @@ from the partition specified at the boot loader installation time. Once \fBstage2\fR is running, it will load and start the third stage boot program from root file system. Boot loader supports loading from the ZFS, UFS and PCFS file systems. The stage3 boot program defaults to be -\fB/boot/zfsloader\fR, and implements a user interface to load and boot the +\fB/boot/loader\fR, and implements a user interface to load and boot the unix kernel. .sp .LP diff --git a/share/man/man8/installboot.8 b/share/man/man8/installboot.8 index a9eb74ef36..d3883ec686 100644 --- a/share/man/man8/installboot.8 +++ b/share/man/man8/installboot.8 @@ -9,9 +9,9 @@ .\" http://www.illumos.org/license/CDDL. .\" .\" -.\" Copyright 2017 Toomas Soome +.\" Copyright 2018 Toomas Soome .\" -.Dd February 19, 2017 +.Dd July 20, 2018 .Dt INSTALLBOOT 8 .Os .Sh NAME @@ -92,7 +92,7 @@ option, .Nm installs the stage1 file on the master boot sector of the disk as well. .It Sy stage3 -.Pa /boot/zfsloader +.Pa /boot/loader is read from file system and executed by .Sy stage2 and will provide boot loader user environment and is responsible of loading diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version index 5d8a7e586f..35ba239a9b 100644 --- a/usr/src/boot/Makefile.version +++ b/usr/src/boot/Makefile.version @@ -33,4 +33,4 @@ LOADER_VERSION = 1.1 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes. # The version is processed from left to right, the version number can only # be increased. -BOOT_VERSION = $(LOADER_VERSION)-2018.5.19.1 +BOOT_VERSION = $(LOADER_VERSION)-2018.7.22.1 diff --git a/usr/src/boot/sys/boot/common/Makefile b/usr/src/boot/sys/boot/common/Makefile deleted file mode 100644 index fcca328b50..0000000000 --- a/usr/src/boot/sys/boot/common/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -.include - -MAN+= loader.8 -.if ${MK_ZFS} != "no" -MAN+= zfsloader.8 -.endif - -.include diff --git a/usr/src/boot/sys/boot/common/paths.h b/usr/src/boot/sys/boot/common/paths.h index 55357ee275..3934ef4909 100644 --- a/usr/src/boot/sys/boot/common/paths.h +++ b/usr/src/boot/sys/boot/common/paths.h @@ -1,4 +1,4 @@ -/*- +/* * Copyright (c) 2016 M. Warner Losh * All rights reserved. * @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef _PATHS_H_ @@ -33,7 +31,6 @@ #define PATH_CONFIG "/boot/config" #define PATH_LOADER "/boot/loader" #define PATH_LOADER_EFI "/boot/" LOADER_EFI -#define PATH_LOADER_ZFS "/boot/zfsloader" #define PATH_KERNEL "/boot/kernel/kernel" #endif /* _PATHS_H_ */ diff --git a/usr/src/boot/sys/boot/efi/loader/Makefile.common b/usr/src/boot/sys/boot/efi/loader/Makefile.common index 5b4a47efda..69fe0547a6 100644 --- a/usr/src/boot/sys/boot/efi/loader/Makefile.common +++ b/usr/src/boot/sys/boot/efi/loader/Makefile.common @@ -1,4 +1,4 @@ -# $FreeBSD$ +# SRCS += boot.c commands.c console.c devopen.c interp.c SRCS += interp_backslash.c interp_parse.c ls.c misc.c @@ -25,12 +25,6 @@ CFLAGS += -DLOADER_MBR_SUPPORT SRCS += bcache.c OBJS += bcache.o -#SRCS += isapnp.c -#SRCS += pnp.c - # Forth interpreter SRCS += interp_forth.c OBJS += interp_forth.o - -MAN += loader.8 -MAN += zfsloader.8 diff --git a/usr/src/boot/sys/boot/i386/cdboot/cdboot.S b/usr/src/boot/sys/boot/i386/cdboot/cdboot.S index 5d88bffcaa..22e277eace 100644 --- a/usr/src/boot/sys/boot/i386/cdboot/cdboot.S +++ b/usr/src/boot/sys/boot/i386/cdboot/cdboot.S @@ -597,6 +597,6 @@ msg_lookupfail: .asciz "File not found\r\n" msg_load2big: .asciz "File too big\r\n" msg_failed: .asciz "Boot failed\r\n" twiddle_chars: .ascii "|/-\\" -loader_paths: .asciz "/BOOT/ZFSLOADER" - .asciz "/boot/zfsloader" +loader_paths: .asciz "/BOOT/LOADER" + .asciz "/boot/loader" .byte 0 diff --git a/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c b/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c index 89eb2281a4..20a4fcd44c 100644 --- a/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c +++ b/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c @@ -228,10 +228,22 @@ main(void) */ if (auto_boot && !*kname) { - memcpy(kname, PATH_LOADER_ZFS, sizeof(PATH_LOADER_ZFS)); + memcpy(kname, PATH_LOADER, sizeof(PATH_LOADER)); if (!keyhit(3)) { load(); auto_boot = 0; + /* + * Try to fall back to /boot/zfsloader. + * This fallback should be eventually removed. + * Created: 08/03/2018 + */ +#define PATH_ZFSLOADER "/boot/zfsloader" + memcpy(kname, PATH_ZFSLOADER, sizeof(PATH_ZFSLOADER)); + load(); + /* + * Still there? restore default loader name for prompt. + */ + memcpy(kname, PATH_LOADER, sizeof(PATH_LOADER)); } } diff --git a/usr/src/boot/sys/boot/i386/loader/Makefile b/usr/src/boot/sys/boot/i386/loader/Makefile index 88e482f26b..76c9f151f1 100644 --- a/usr/src/boot/sys/boot/i386/loader/Makefile +++ b/usr/src/boot/sys/boot/i386/loader/Makefile @@ -20,11 +20,10 @@ include $(SRC)/boot/Makefile.version CFLAGS= -O2 CPPFLAGS= -D_STANDALONE -nostdinc -I../../../../include -I../../.. CPPFLAGS += -I$(SRCTOP)/arch/x86/include/sys/acpi -LOADER= zfsloader +LOADER= loader NEWVERSWHAT= "ZFS enabled bootstrap loader" x86 -MAN= -# Set by zfsloader Makefile +# Set by loader Makefile CPPFLAGS += -DLOADER_ZFS_SUPPORT -I../../zfs CPPFLAGS += -I../libi386 LIBZFSBOOT= ../../zfs/$(MACH)/libzfsboot.a @@ -83,8 +82,6 @@ SRCS += pnp.c # Forth interpreter SRCS += interp_forth.c -MAN += loader.8 -MAN += zfsloader.8 CPPFLAGS += -I../../common CPPFLAGS += -I. diff --git a/usr/src/boot/sys/boot/i386/pxeldr/Makefile b/usr/src/boot/sys/boot/i386/pxeldr/Makefile index 4ebc41830a..6b67f85cb5 100644 --- a/usr/src/boot/sys/boot/i386/pxeldr/Makefile +++ b/usr/src/boot/sys/boot/i386/pxeldr/Makefile @@ -49,7 +49,7 @@ FILEMODE=0444 CFLAGS +=-I../common -LOADERBIN= ../loader/zfsloader.bin +LOADERBIN= ../loader/loader.bin CLEANFILES += ${BOOT}.tmp diff --git a/usr/src/boot/sys/boot/sparc64/Makefile b/usr/src/boot/sys/boot/sparc64/Makefile index a768039090..3bc76be267 100644 --- a/usr/src/boot/sys/boot/sparc64/Makefile +++ b/usr/src/boot/sys/boot/sparc64/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= boot1 loader zfsboot zfsloader +SUBDIR= boot1 loader zfsboot .include diff --git a/usr/src/boot/sys/boot/sparc64/loader/Makefile b/usr/src/boot/sys/boot/sparc64/loader/Makefile index 2884cf082c..484067b9c0 100644 --- a/usr/src/boot/sys/boot/sparc64/loader/Makefile +++ b/usr/src/boot/sys/boot/sparc64/loader/Makefile @@ -5,7 +5,7 @@ MK_SSP= no MAN= PROG?= loader -NEWVERSWHAT?= "bootstrap loader" sparc64 +NEWVERSWHAT?= "ZFS enabled bootstrap loader" sparc64 INSTALLFLAGS= -b # Architecture-specific loader code diff --git a/usr/src/boot/sys/boot/sparc64/zfsloader/Makefile b/usr/src/boot/sys/boot/sparc64/zfsloader/Makefile deleted file mode 100644 index 1ed2808292..0000000000 --- a/usr/src/boot/sys/boot/sparc64/zfsloader/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../loader - -PROG= zfsloader -NEWVERSWHAT= "ZFS enabled bootstrap loader" sparc64 -LOADER_ZFS_SUPPORT=yes - -.include "${.CURDIR}/../loader/Makefile" diff --git a/usr/src/pkg/manifests/system-boot-loader.mf b/usr/src/pkg/manifests/system-boot-loader.mf index daf4e61112..37f8cef5e7 100644 --- a/usr/src/pkg/manifests/system-boot-loader.mf +++ b/usr/src/pkg/manifests/system-boot-loader.mf @@ -78,13 +78,13 @@ $(i386_ONLY)file path=boot/forth/shortcuts.4th group=sys mode=0444 $(i386_ONLY)file path=boot/forth/support.4th group=sys mode=0444 $(i386_ONLY)file path=boot/forth/version.4th group=sys mode=0444 $(i386_ONLY)file path=boot/gptzfsboot group=sys mode=0444 +$(i386_ONLY)file path=boot/loader group=sys mode=0444 $(i386_ONLY)file path=boot/loader.help group=sys mode=0444 $(i386_ONLY)file path=boot/loader.rc group=sys mode=0444 $(i386_ONLY)file path=boot/loader32.efi group=sys mode=0555 $(i386_ONLY)file path=boot/loader64.efi group=sys mode=0555 $(i386_ONLY)file path=boot/pmbr group=sys mode=0444 $(i386_ONLY)file path=boot/pxeboot group=sys mode=0444 -$(i386_ONLY)file path=boot/zfsloader group=sys mode=0444 $(i386_ONLY)file path=usr/share/man/man4/loader.conf.4 $(i386_ONLY)file path=usr/share/man/man5/brand.4th.5 $(i386_ONLY)file path=usr/share/man/man5/check-password.4th.5 @@ -97,7 +97,6 @@ $(i386_ONLY)file path=usr/share/man/man5/menu.4th.5 $(i386_ONLY)file path=usr/share/man/man5/menusets.4th.5 $(i386_ONLY)file path=usr/share/man/man5/pxeboot.5 $(i386_ONLY)file path=usr/share/man/man5/version.4th.5 -$(i386_ONLY)file path=usr/share/man/man5/zfsloader.5 license lic_CDDL license=lic_CDDL license usr/src/boot/COPYRIGHT license=usr/src/boot/COPYRIGHT license usr/src/boot/sys/boot/common/linenoise/LICENSE \ -- 2.11.4.GIT