diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-05-30 01:31:13 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-05-30 01:31:13 +0000 |
| commit | 7ba125129527f7ee8a65332ddb0f06cfad24095c (patch) | |
| tree | 2044d8a6bfe56b3f14eeb9e323981e5b219de23a /sys/arch | |
| parent | 22ad397d75fb30640f9f10ea37e1a11e295a8bc7 (diff) | |
shrink alpha boot blocks another little bit
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/alpha/stand/boot/boot.c | 12 | ||||
| -rw-r--r-- | sys/arch/alpha/stand/boot/newvers.sh | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/alpha/stand/boot/boot.c b/sys/arch/alpha/stand/boot/boot.c index f943553f702..11e8c562add 100644 --- a/sys/arch/alpha/stand/boot/boot.c +++ b/sys/arch/alpha/stand/boot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.17 2004/12/01 20:55:09 deraadt Exp $ */ +/* $OpenBSD: boot.c,v 1.18 2005/05/30 01:31:12 deraadt Exp $ */ /* $NetBSD: boot.c,v 1.10 1997/01/18 01:58:33 cgd Exp $ */ /* @@ -54,7 +54,7 @@ int loadfile(char *, u_int64_t *); char boot_file[128]; char boot_flags[128]; -extern char bootprog_name[], bootprog_rev[]; +extern char bootprog_name[]; struct bootinfo_v1 bootinfo_v1; @@ -75,7 +75,7 @@ main() init_prom_calls(); /* print a banner */ - printf("%s %s\n", bootprog_name, bootprog_rev); + printf("%s\n", bootprog_name); /* switch to OSF pal code. */ OSFpal(); @@ -87,10 +87,10 @@ main() (void)printf("Boot file: %s %s\n", boot_file, boot_flags); if (boot_file[0] != '\0') - win = (loadfile(name = boot_file, &entry) == 0); + name = boot_file; else - win = (loadfile(name = "bsd", &entry) == 0); - + name = "bsd"; + win = (loadfile(name, &entry) == 0); if (!win) goto fail; diff --git a/sys/arch/alpha/stand/boot/newvers.sh b/sys/arch/alpha/stand/boot/newvers.sh index 012d3cf713f..e376aeeaf14 100644 --- a/sys/arch/alpha/stand/boot/newvers.sh +++ b/sys/arch/alpha/stand/boot/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.8 2004/07/05 19:59:20 deraadt Exp $ +# $OpenBSD: newvers.sh,v 1.9 2005/05/30 01:31:12 deraadt Exp $ # $NetBSD: newvers.sh,v 1.3 1996/06/14 20:03:04 cgd Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -35,7 +35,7 @@ u=${USER-root} h=`hostname` t=`date` r=`awk ' { print $3 ; exit } ' < $1` -echo "char bootprog_name[] = \"OpenBSD/Alpha Secondary Boot\";" > vers.c -echo "char bootprog_rev[] = \"${r}\";" >> vers.c +echo "char bootprog_name[] = \"OpenBSD/Alpha boot ${r}\";" > vers.c +#echo "char bootprog_rev[] = \"${r}\";" >> vers.c #echo "char bootprog_date[] = \"${t}\";" >> vers.c #echo "char bootprog_maker[] = \"${u}@${h}\";" >> vers.c |