From owner-svn-src-all@freebsd.org Wed Jan 27 16:39:38 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 94566A704EE for ; Wed, 27 Jan 2016 16:39:38 +0000 (UTC) (envelope-from steven.hartland@multiplay.co.uk) Received: from mail-wm0-x236.google.com (mail-wm0-x236.google.com [IPv6:2a00:1450:400c:c09::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BC741BF1 for ; Wed, 27 Jan 2016 16:39:38 +0000 (UTC) (envelope-from steven.hartland@multiplay.co.uk) Received: by mail-wm0-x236.google.com with SMTP id p63so35237646wmp.1 for ; Wed, 27 Jan 2016 08:39:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=multiplay-co-uk.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-type:content-transfer-encoding; bh=hQIjJZuusLQMMjqGyS9zjag8Ufyv7BcKaJ7eQ/b1O9M=; b=vZpmJCHhvKs7wpfyTgKH28sqPvBkVE25Ep4enzsyEDBAlpjRs7Kqas9dnnbvyywjyF Vjm1/bQ3moWY0cfRD++YT6yObUhBPOXoWSl0rv6VaoDZLZp9GYIzjBANP9S7sFUkDcid FqD17bC4hs5fPfKcG0DQNTYUPf97GCY/qHpFR+l2maeu2bt3dLltXcNGe86dCQShsA8v Xm0Phv/OcxV8Mo94FcbenTTGiyStOMdM63UNnGggBPt29fnms3RJyjXDh6AEFlRWMPl3 RIa5lvzhTwMnb83VA+sDeKFTlsofi2AX/tyo/eF5tiBpGy5XfodUB1LTii8Ox78TDMPy QgAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=hQIjJZuusLQMMjqGyS9zjag8Ufyv7BcKaJ7eQ/b1O9M=; b=cGLaJHk44wNyUrlianA9Ec39XWf6ygBp4mtfPXyCPWGOMdA0cCiJc9wMgc38ilOwrO Ny0xmc/Yi3uRA3IchKTATUDvuEWr3+kOnJUqH1z5nV50972esAXnXXk/vBY5e4uy2EwN Cw4gGhGoFpHgBsh+hJxuJodxR5fTkix9Nr//jDZ4YlKo0tm6mRmOsRwqBWSTusBI0NcZ 1AMjLzPj5NpyYrwOVnvvEC9GWSRSk8gc2FV7XwjLCAj5h0n1BjuKkWDOKl4bGybAIjFu lJC2nibSUiXAbY/C9aK0+6NDkSV42G8TUPPxgFiixx5u1qd62iW9Hsfzz0thxuB4hlud WMSg== X-Gm-Message-State: AG10YOQd6Jz2P512WowCOq306VnLsmSXRPcCdhAK6lr2xs2mitH0kxg2uf6NdU3KKb9+bZ76 X-Received: by 10.194.240.234 with SMTP id wd10mr34185648wjc.129.1453912776613; Wed, 27 Jan 2016 08:39:36 -0800 (PST) Received: from [10.10.1.58] (liv3d.labs.multiplay.co.uk. [82.69.141.171]) by smtp.gmail.com with ESMTPSA id e77sm9091694wma.18.2016.01.27.08.39.34 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 27 Jan 2016 08:39:35 -0800 (PST) Subject: Re: svn commit: r294925 - in head/sys/boot: common i386/boot2 i386/gptboot i386/zfsboot mips/beri/boot2 pc98/boot2 To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201601271636.u0RGaI90013974@repo.freebsd.org> From: Steven Hartland Message-ID: <56A8F2D5.5000302@multiplay.co.uk> Date: Wed, 27 Jan 2016 16:39:49 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <201601271636.u0RGaI90013974@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jan 2016 16:39:38 -0000 On 27/01/2016 16:36, Warner Losh wrote: > Author: imp > Date: Wed Jan 27 16:36:18 2016 > New Revision: 294925 > URL: https://svnweb.freebsd.org/changeset/base/294925 > > Log: > Fix mistake when transitioning to the new defines with ZFS loader. I > hate adding yet another define, but it is the lessor of the evil > choices available. Kill another evil by removing PATH_BOOT3 and > replacing it with PATH_LOADER or PATH_LOADER_ZFS as appropriate. > > PR: 206659 > > Modified: > head/sys/boot/common/paths.h > head/sys/boot/i386/boot2/boot2.c > head/sys/boot/i386/gptboot/gptboot.c > head/sys/boot/i386/zfsboot/zfsboot.c > head/sys/boot/mips/beri/boot2/boot2.c > head/sys/boot/pc98/boot2/boot2.c > > Modified: head/sys/boot/common/paths.h > ============================================================================== > --- head/sys/boot/common/paths.h Wed Jan 27 16:17:15 2016 (r294924) > +++ head/sys/boot/common/paths.h Wed Jan 27 16:36:18 2016 (r294925) > @@ -31,9 +31,9 @@ > > #define PATH_DOTCONFIG "/boot.config" > #define PATH_CONFIG "/boot/config" > -#define PATH_BOOT3 "/boot/loader" > #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_ */ > > Modified: head/sys/boot/i386/boot2/boot2.c > ============================================================================== > --- head/sys/boot/i386/boot2/boot2.c Wed Jan 27 16:17:15 2016 (r294924) > +++ head/sys/boot/i386/boot2/boot2.c Wed Jan 27 16:36:18 2016 (r294925) > @@ -235,7 +235,7 @@ main(void) > */ > > if (!kname) { > - kname = PATH_BOOT3; > + kname = PATH_LOADER; > if (autoboot && !keyhit(3*SECOND)) { > load(); > kname = PATH_KERNEL; > > Modified: head/sys/boot/i386/gptboot/gptboot.c > ============================================================================== > --- head/sys/boot/i386/gptboot/gptboot.c Wed Jan 27 16:17:15 2016 (r294924) > +++ head/sys/boot/i386/gptboot/gptboot.c Wed Jan 27 16:36:18 2016 (r294925) > @@ -178,7 +178,7 @@ main(void) > > if (autoboot && keyhit(3)) { > if (*kname == '\0') > - memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3)); > + memcpy(kname, PATH_LOADER, sizeof(PATH_LOADER)); > break; > } > autoboot = 0; > @@ -190,7 +190,7 @@ main(void) > */ > if (*kname != '\0') > load(); > - memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3)); > + memcpy(kname, PATH_LOADER, sizeof(PATH_LOADER)); > load(); > memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL)); > load(); > > Modified: head/sys/boot/i386/zfsboot/zfsboot.c > ============================================================================== > --- head/sys/boot/i386/zfsboot/zfsboot.c Wed Jan 27 16:17:15 2016 (r294924) > +++ head/sys/boot/i386/zfsboot/zfsboot.c Wed Jan 27 16:36:18 2016 (r294925) > @@ -546,12 +546,12 @@ main(void) > } > > /* > - * Try to exec stage 3 boot loader. If interrupted by a keypress, > + * Try to exec /boot/loader. If interrupted by a keypress, This comment should either refer the constant (so its always correct) or be /boot/zfsloader not /boot/loader