From 821728ada80815e4f232a7e23d373ac2aba729a1 Mon Sep 17 00:00:00 2001 From: miod Date: Mon, 13 Mar 2023 20:19:22 +0000 Subject: [PATCH] "ask name" option letter is 'n' instead of 'a' on pmax and alpha for historical (and firmware) reasons. --- sys/stand/boot/vars.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/stand/boot/vars.c b/sys/stand/boot/vars.c index 6093179c760..d1516776315 100644 --- a/sys/stand/boot/vars.c +++ b/sys/stand/boot/vars.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vars.c,v 1.16 2023/02/23 19:48:22 miod Exp $ */ +/* $OpenBSD: vars.c,v 1.17 2023/03/13 20:19:22 miod Exp $ */ /* * Copyright (c) 1998-2000 Michael Shalayeff @@ -176,6 +176,12 @@ Xtty(void) } #endif +#ifdef __alpha__ +#define ASKNAME_LETTER 'n' +#else +#define ASKNAME_LETTER 'a' +#endif + static int Xhowto(void) { @@ -183,7 +189,7 @@ Xhowto(void) if (cmd.boothowto) { putchar('-'); if (cmd.boothowto & RB_ASKNAME) - putchar('a'); + putchar(ASKNAME_LETTER); if (cmd.boothowto & RB_CONFIG) putchar('c'); if (cmd.boothowto & RB_SINGLE) @@ -208,7 +214,7 @@ bootparse(int i) if (*cp == '-') { while (*++cp) { switch (*cp) { - case 'a': + case ASKNAME_LETTER: howto |= RB_ASKNAME; break; case 'c': -- 2.20.1