summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sbin/fsck_ffs/main.c6
-rw-r--r--sbin/fsck_ffs/setup.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index d2d0c86d4a4..b80300d0dbf 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.48 2015/11/23 23:01:20 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.49 2015/11/24 21:42:54 deraadt Exp $ */
/* $NetBSD: main.c,v 1.22 1996/10/11 20:15:48 thorpej Exp $ */
/*
@@ -170,10 +170,6 @@ checkfilesys(char *filesys, char *mntpt, long auxdata, int child)
if (debug && preen)
pwarn("starting\n");
- if (!hotroot())
- if (pledge("stdio rpath wpath getpw disklabel", NULL) == -1)
- err(1, "pledge");
-
switch (setup(filesys)) {
case 0:
if (preen)
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 1a81f6056ca..277e51b82ef 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: setup.c,v 1.59 2015/10/15 15:11:10 semarie Exp $ */
+/* $OpenBSD: setup.c,v 1.60 2015/11/24 21:42:54 deraadt Exp $ */
/* $NetBSD: setup.c,v 1.27 1996/09/27 22:45:19 christos Exp $ */
/*
@@ -101,6 +101,10 @@ setup(char *dev)
blockcheck(unrawname(realdev));
strlcpy(rdevname, realdev, sizeof(rdevname));
setcdevname(rdevname, dev, preen);
+
+ if (!hotroot())
+ if (pledge("stdio rpath wpath getpw disklabel", NULL) == -1)
+ err(1, "pledge");
}
if (fstat(fsreadfd, &statb) < 0) {
printf("Can't stat %s: %s\n", realdev, strerror(errno));