diff options
| author |   krw <krw@openbsd.org> | 2018-09-01 16:55:29 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2018-09-01 16:55:29 +0000 |
| commit | f917af54108a33803c675dec26bd7a3217f5a56f (patch) | |
| tree | e0383f63f7de77ed924a8b640c751f68fe5ef94e /usr.sbin/installboot | |
| parent | Tweak comment. (diff) | |
| download | wireguard-openbsd-f917af54108a33803c675dec26bd7a3217f5a56f.tar.xz wireguard-openbsd-f917af54108a33803c675dec26bd7a3217f5a56f.zip | |
Remove 'overlap_allowance' parameter from bootstrap().
It was added to support Vax. Vax is dead Jim.
ok deraadt@
Diffstat (limited to 'usr.sbin/installboot')
| -rw-r--r-- | usr.sbin/installboot/bootstrap.c | 6 | ||||
| -rw-r--r-- | usr.sbin/installboot/hppa_installboot.c | 4 | ||||
| -rw-r--r-- | usr.sbin/installboot/installboot.h | 4 | ||||
| -rw-r--r-- | usr.sbin/installboot/landisk_installboot.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/installboot/bootstrap.c b/usr.sbin/installboot/bootstrap.c index af2a4812069..0df2145b48b 100644 --- a/usr.sbin/installboot/bootstrap.c +++ b/usr.sbin/installboot/bootstrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootstrap.c,v 1.9 2015/12/28 23:00:29 krw Exp $ */ +/* $OpenBSD: bootstrap.c,v 1.10 2018/09/01 16:55:29 krw Exp $ */ /* * Copyright (c) 2013 Joel Sing <jsing@openbsd.org> @@ -32,7 +32,7 @@ #include "installboot.h" void -bootstrap(int devfd, char *dev, char *bootfile, unsigned int overlap_allowance) +bootstrap(int devfd, char *dev, char *bootfile) { struct disklabel dl; struct disklabel *lp; @@ -92,7 +92,7 @@ bootstrap(int devfd, char *dev, char *bootfile, unsigned int overlap_allowance) continue; if (DL_GETPSIZE(pp) == 0) continue; - if ((u_int64_t)bootsec <= DL_GETPOFFSET(pp) + overlap_allowance) + if ((u_int64_t)bootsec <= DL_GETPOFFSET(pp)) continue; switch (pp->p_fstype) { case FS_BOOT: diff --git a/usr.sbin/installboot/hppa_installboot.c b/usr.sbin/installboot/hppa_installboot.c index 1568e07658e..d0fa5461ce9 100644 --- a/usr.sbin/installboot/hppa_installboot.c +++ b/usr.sbin/installboot/hppa_installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hppa_installboot.c,v 1.2 2015/10/15 19:27:30 miod Exp $ */ +/* $OpenBSD: hppa_installboot.c,v 1.3 2018/09/01 16:55:29 krw Exp $ */ /* * Copyright (c) 2013 Joel Sing <jsing@openbsd.org> @@ -33,5 +33,5 @@ md_loadboot(void) void md_installboot(int devfd, char *dev) { - bootstrap(devfd, dev, stage1, 0); + bootstrap(devfd, dev, stage1); } diff --git a/usr.sbin/installboot/installboot.h b/usr.sbin/installboot/installboot.h index 114fa590423..f42c316181e 100644 --- a/usr.sbin/installboot/installboot.h +++ b/usr.sbin/installboot/installboot.h @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.h,v 1.10 2015/10/15 19:27:30 miod Exp $ */ +/* $OpenBSD: installboot.h,v 1.11 2018/09/01 16:55:29 krw Exp $ */ /* * Copyright (c) 2012, 2013 Joel Sing <jsing@openbsd.org> * @@ -26,7 +26,7 @@ extern char *stage1; extern char *stage2; #ifdef BOOTSTRAP -void bootstrap(int, char *, char *, unsigned int); +void bootstrap(int, char *, char *); #endif int filecopy(const char *, const char *); diff --git a/usr.sbin/installboot/landisk_installboot.c b/usr.sbin/installboot/landisk_installboot.c index c2758156ca7..f8c8d91c462 100644 --- a/usr.sbin/installboot/landisk_installboot.c +++ b/usr.sbin/installboot/landisk_installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: landisk_installboot.c,v 1.8 2016/01/15 22:19:29 tobiasu Exp $ */ +/* $OpenBSD: landisk_installboot.c,v 1.9 2018/09/01 16:55:29 krw Exp $ */ /* * Copyright (c) 2013 Joel Sing <jsing@openbsd.org> @@ -52,5 +52,5 @@ md_installboot(int devfd, char *dev) exit(1); /* Write bootblock into the superblock. */ - bootstrap(devfd, dev, stage1, 0); + bootstrap(devfd, dev, stage1); } |