diff options
| author |   jsing <jsing@openbsd.org> | 2014-01-19 03:49:31 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-01-19 03:49:31 +0000 |
| commit | 561c6a96494f80f73dcada7feac4bb34c61c24f0 (patch) | |
| tree | 2ae34f34cedc6ba8c19cccccdff7aa7ddb5123d6 | |
| parent | When copying files do it in 512 byte blocks so that we're less likely to (diff) | |
| download | wireguard-openbsd-561c6a96494f80f73dcada7feac4bb34c61c24f0.tar.xz wireguard-openbsd-561c6a96494f80f73dcada7feac4bb34c61c24f0.zip | |
Do not prefix user specified stages with the root filesystem mount point.
| -rw-r--r-- | usr.sbin/installboot/installboot.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/installboot/installboot.c b/usr.sbin/installboot/installboot.c index 30b7d5a17af..2ecf652f47f 100644 --- a/usr.sbin/installboot/installboot.c +++ b/usr.sbin/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.2 2014/01/18 02:47:27 jsing Exp $ */ +/* $OpenBSD: installboot.c,v 1.3 2014/01/19 03:49:31 jsing Exp $ */ /* * Copyright (c) 2012, 2013 Joel Sing <jsing@openbsd.org> @@ -87,9 +87,9 @@ main(int argc, char **argv) /* Prefix stages with root. */ if (verbose) fprintf(stderr, "Using %s as root\n", root); - if (stage1 != NULL) + if (argc <= 1 && stage1 != NULL) stage1 = fileprefix(root, stage1); - if (stage2 != NULL) + if (argc <= 2 && stage2 != NULL) stage2 = fileprefix(root, stage2); if ((devfd = opendev(dev, (nowrite ? O_RDONLY : O_RDWR), OPENDEV_PART, |