Date: Sun, 15 Jan 2012 21:52:45 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r230166 - stable/8/sys/boot/i386/zfsboot Message-ID: <201201152152.q0FLqj5n001869@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Sun Jan 15 21:52:45 2012 New Revision: 230166 URL: http://svn.freebsd.org/changeset/base/230166 Log: MFC r228267: zfsboot: print boot.config contents before parsing it Modified: stable/8/sys/boot/i386/zfsboot/zfsboot.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/boot/i386/zfsboot/zfsboot.c ============================================================================== --- stable/8/sys/boot/i386/zfsboot/zfsboot.c Sun Jan 15 21:51:55 2012 (r230165) +++ stable/8/sys/boot/i386/zfsboot/zfsboot.c Sun Jan 15 21:52:45 2012 (r230166) @@ -534,10 +534,10 @@ main(void) } if (*cmd) { - if (parse()) - autoboot = 0; if (!OPT_CHECK(RBX_QUIET)) printf("%s: %s", PATH_CONFIG, cmd); + if (parse()) + autoboot = 0; /* Do not process this command twice */ *cmd = 0; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201152152.q0FLqj5n001869>