svn commit: r230165 - stable/9/sys/boot/i386/zfsboot

[Andriy Gapon]

Author: avg
Date: Sun Jan 15 21:51:55 2012
New Revision: 230165
URL: http://svn.freebsd.org/changeset/base/230165

Log:
  MFC r228267: zfsboot: print boot.config contents before parsing it

Modified:
  stable/9/sys/boot/i386/zfsboot/zfsboot.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/boot/i386/zfsboot/zfsboot.c
==============================================================================
--- stable/9/sys/boot/i386/zfsboot/zfsboot.c	Sun Jan 15 21:50:17 2012	(r230164)
+++ stable/9/sys/boot/i386/zfsboot/zfsboot.c	Sun Jan 15 21:51:55 2012	(r230165)
@@ -539,10 +539,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;
     }