From owner-svn-src-all@FreeBSD.ORG Sun Jan 27 17:33:22 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DFCF3C2B; Sun, 27 Jan 2013 17:33:22 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CF8DAD50; Sun, 27 Jan 2013 17:33:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RHXMwQ023217; Sun, 27 Jan 2013 17:33:22 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RHXMx4023216; Sun, 27 Jan 2013 17:33:22 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201301271733.r0RHXMx4023216@svn.freebsd.org> From: Marius Strobl Date: Sun, 27 Jan 2013 17:33:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245990 - stable/9/sys/boot/sparc64/boot1 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 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: Sun, 27 Jan 2013 17:33:23 -0000 Author: marius Date: Sun Jan 27 17:33:22 2013 New Revision: 245990 URL: http://svnweb.freebsd.org/changeset/base/245990 Log: MFC: r244307 Restore pre-r234898 (MFC'ed to stable/9 in r236076) printing of boot loader and path. Modified: stable/9/sys/boot/sparc64/boot1/boot1.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/boot/ (props changed) Modified: stable/9/sys/boot/sparc64/boot1/boot1.c ============================================================================== --- stable/9/sys/boot/sparc64/boot1/boot1.c Sun Jan 27 17:24:50 2013 (r245989) +++ stable/9/sys/boot/sparc64/boot1/boot1.c Sun Jan 27 17:33:22 2013 (r245990) @@ -340,11 +340,11 @@ main(int ac, char **av) } #ifdef ZFSBOOT - printf(" \n>> FreeBSD/sparc64 ZFS boot block\n Boot path: %s\n", + printf(" \n>> FreeBSD/sparc64 ZFS boot block\n Boot path: %s\n", bootpath); #else - printf(" \n>> FreeBSD/sparc64 boot block\n Boot path: %s\n" - " Boot loader: %s\n", "", bootpath, path); + printf(" \n>> FreeBSD/sparc64 boot block\n Boot path: %s\n" + " Boot loader: %s\n", bootpath, path); #endif if (mount(bootpath) == -1)