From owner-svn-src-head@freebsd.org Fri Jul 27 22:29:22 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CACA11058F77; Fri, 27 Jul 2018 22:29:22 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 675538C6C0; Fri, 27 Jul 2018 22:29:21 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A802C1DDF7; Fri, 27 Jul 2018 22:29:20 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6RMTKJi039679; Fri, 27 Jul 2018 22:29:20 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6RMTKUW039678; Fri, 27 Jul 2018 22:29:20 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201807272229.w6RMTKUW039678@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 27 Jul 2018 22:29:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336791 - head/stand/efi/loader X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/stand/efi/loader X-SVN-Commit-Revision: 336791 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jul 2018 22:29:23 -0000 Author: imp Date: Fri Jul 27 22:29:20 2018 New Revision: 336791 URL: https://svnweb.freebsd.org/changeset/base/336791 Log: In the BootXXXX message, use the actual boot variable. Fix stupid compile issue that crept in when I moved patches between trees. Modified: head/stand/efi/loader/main.c Modified: head/stand/efi/loader/main.c ============================================================================== --- head/stand/efi/loader/main.c Fri Jul 27 22:29:15 2018 (r336790) +++ head/stand/efi/loader/main.c Fri Jul 27 22:29:20 2018 (r336791) @@ -368,11 +368,11 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char * * path in it... */ if (last_dp == first_dp) { - printf("Ignoring BootXXX: Only one DP found\n"); + printf("Ignoring Boot%04x: Only one DP found\n", boot_current); return NOT_SPECIFIC; } - if (efi_devpath_to_media_path(path) == NULL) { - printf("Ignoring BootXXXX: No Media Path\n"); + if (efi_devpath_to_media_path(last_dp) == NULL) { + printf("Ignoring Boot%04x: No Media Path\n", boot_current); return NOT_SPECIFIC; } @@ -382,12 +382,12 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char * */ pp = efiblk_get_pdinfo_by_device_path(last_dp); if (pp == NULL) { - printf("Ignoring BootXXXX: Device Path not found\n"); + printf("Ignoring Boot%04x: Device Path not found\n", boot_current); return BAD_CHOICE; } set_currdev_pdinfo(pp); if (!sanity_check_currdev()){ - printf("Ignoring BootXXX: sanity check failed\n"); + printf("Ignoring Boot%04x: sanity check failed\n", boot_current); return BAD_CHOICE; } @@ -402,27 +402,29 @@ match_boot_info(EFI_LOADED_IMAGE *img __unused, char * dp = efi_devpath_last_node(last_dp); if (DevicePathType(dp) != MEDIA_DEVICE_PATH || DevicePathSubType(dp) != MEDIA_FILEPATH_DP) { - printf("Using BootXXXX for root partition\n"); + printf("Using Boot%04x for root partition\n", boot_current); return (BOOT_INFO_OK); /* use currdir, default kernel */ } fp = (FILEPATH_DEVICE_PATH *)dp; ucs2_to_utf8(fp->PathName, &kernel); if (kernel == NULL) { - printf("Not using BootXXX: can't decode kernel\n"); + printf("Not using Boot%04x: can't decode kernel\n", boot_current); return (BAD_CHOICE); } if (*kernel == '\\' || isupper(*kernel)) fix_dosisms(kernel); if (stat(kernel, &st) != 0) { free(kernel); - printf("Not using BootXXX: can't find %s\n", kernel); + printf("Not using Boot%04x: can't find %s\n", boot_current, + kernel); return (BAD_CHOICE); } setenv("kernel", kernel, 1); free(kernel); text = efi_devpath_name(last_dp); if (text) { - printf("Using BootXXX %S + %s\n", text, kernel); + printf("Using Boot$04x %S + %s\n", boot_current, text, + kernel); efi_free_devpath_name(text); }