From 85767896da1c52300de322e3fc4f29fe9b7e4413 Mon Sep 17 00:00:00 2001 From: jamie Date: Thu, 4 Nov 2010 17:01:21 +0000 Subject: Reads the mount.fstab file, and put its lines separately into the IP__MOUNT_FROM_FSTAB internal parameter. --- usr.sbin/jail/jail.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'usr.sbin/jail/jail.c') diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c index fbfa28c..0bc1bd1 100644 --- a/usr.sbin/jail/jail.c +++ b/usr.sbin/jail/jail.c @@ -294,7 +294,7 @@ main(int argc, char **argv) clear_persist(j); if (j->flags & JF_MOUNTED) { (void)run_command(j, NULL, IP_MOUNT_DEVFS); - if (run_command(j, NULL, IP_MOUNT_FSTAB)) + if (run_command(j, NULL, IP__MOUNT_FROM_FSTAB)) while (run_command(j, NULL, 0)) ; if (run_command(j, NULL, IP_MOUNT)) while (run_command(j, NULL, 0)) ; @@ -393,10 +393,11 @@ main(int argc, char **argv) continue; /* FALLTHROUGH */ case IP_MOUNT: - if (run_command(j, &plimit, IP_MOUNT_FSTAB)) + if (run_command(j, &plimit, + IP__MOUNT_FROM_FSTAB)) continue; /* FALLTHROUGH */ - case IP_MOUNT_FSTAB: + case IP__MOUNT_FROM_FSTAB: if (run_command(j, &plimit, IP_MOUNT_DEVFS)) continue; /* FALLTHROUGH */ @@ -509,10 +510,11 @@ main(int argc, char **argv) continue; /* FALLTHROUGH */ case IP_MOUNT_DEVFS: - if (run_command(j, &plimit, IP_MOUNT_FSTAB)) + if (run_command(j, &plimit, + IP__MOUNT_FROM_FSTAB)) continue; /* FALLTHROUGH */ - case IP_MOUNT_FSTAB: + case IP__MOUNT_FROM_FSTAB: if (run_command(j, &plimit, IP_MOUNT)) continue; /* FALLTHROUGH */ -- cgit v1.1