From owner-cvs-src@FreeBSD.ORG  Thu Dec 11 14:43:02 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3DBFF16A4CE; Thu, 11 Dec 2003 14:43:02 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 0C65E43DB3; Thu, 11 Dec 2003 14:42:51 -0800 (PST)
	(envelope-from jhb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBBMgoXJ052191;
	Thu, 11 Dec 2003 14:42:50 -0800 (PST)
	(envelope-from jhb@repoman.freebsd.org)
Received: (from jhb@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBBMgo0h052190;
	Thu, 11 Dec 2003 14:42:50 -0800 (PST)
	(envelope-from jhb)
Message-Id: <200312112242.hBBMgo0h052190@repoman.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 11 Dec 2003 14:42:50 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/boot/i386/cdboot cdboot.s
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Dec 2003 22:43:02 -0000

jhb         2003/12/11 14:42:50 PST

  FreeBSD src repository

  Modified files:
    sys/boot/i386/cdboot cdboot.s 
  Log:
  - Change the lookup() function to report success or failure using the carry
    flag rather than explicitly halting if a lookup failed.
  - Add a loop around the call to lookup() to traverse an array of
    nul-terminated strings for possible paths to the boot loader.  A double
    nul character denotes the end of the list.
  - Add a new message to say that the boot failed if all of the path lookups
    for a boot loader file failed.
  - Add '/boot/loader' as a second boot path.  If you build an ISO using
    risky options to mkisofs such as -U then the loader will be called
    '/boot/loader' rather than '/BOOT/LOADER;0'.  This allows cdboot to work
    with such risky ISO images.
  - Bump version to 1.2 to denote added functionality.
  
  The basic idea as well as some of the code were provided by the submitter,
  but I added some extra code to use a loop rather than hard-code just 2
  possible paths.
  
  PR:             misc/43543
  Submitted by:   kientzle
  MFC after:      1 week
  
  Revision  Changes    Path
  1.10      +32 -8     src/sys/boot/i386/cdboot/cdboot.s