summaryrefslogtreecommitdiffstats
path: root/usr.sbin/jail/jail.c
diff options
context:
space:
mode:
authorjamie <jamie@FreeBSD.org>2010-11-04 17:01:21 +0000
committerjamie <jamie@FreeBSD.org>2010-11-04 17:01:21 +0000
commit85767896da1c52300de322e3fc4f29fe9b7e4413 (patch)
treebced28660a29b3ffad515a0234107c8eeb256ded /usr.sbin/jail/jail.c
parent94aa5f72213aae7248f78420b16afc320dd93e4b (diff)
downloadFreeBSD-src-85767896da1c52300de322e3fc4f29fe9b7e4413.zip
FreeBSD-src-85767896da1c52300de322e3fc4f29fe9b7e4413.tar.gz
Reads the mount.fstab file, and put its lines separately into the
IP__MOUNT_FROM_FSTAB internal parameter.
Diffstat (limited to 'usr.sbin/jail/jail.c')
-rw-r--r--usr.sbin/jail/jail.c12
1 files changed, 7 insertions, 5 deletions
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 */
OpenPOWER on IntegriCloud