From aceea37698646ef3e1e6d05b2e98f23ea0696ab0 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 25 Feb 2016 07:53:50 +0100
Subject: [PATCH] dhcpd: directly execute the chroot setup

---
 src/etc/inc/services.inc | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 4d354e317..b865c395a 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -386,35 +386,27 @@ function services_dhcpdv6_leasesfile()
     return "{$g['dhcpd_chroot_path']}/var/db/dhcpd6.leases";
 }
 
-function services_dhcpd_configure($family = "all", $blacklist = array())
+function services_dhcpd_configure($family = 'all', $blacklist = array())
 {
-    global $config, $g;
+    global $g;
 
-    /* configure DHCPD chroot once */
-    $fd = fopen('/tmp/dhcpd.sh', 'w');
-    fwrite($fd, "/bin/mkdir -p {$g['dhcpd_chroot_path']}\n");
-    fwrite($fd, "/bin/mkdir -p {$g['dhcpd_chroot_path']}/dev\n");
-    fwrite($fd, "/bin/mkdir -p {$g['dhcpd_chroot_path']}/etc\n");
-    fwrite($fd, "/bin/mkdir -p {$g['dhcpd_chroot_path']}/usr/local/sbin\n");
-    fwrite($fd, "/bin/mkdir -p {$g['dhcpd_chroot_path']}/var/db\n");
-    fwrite($fd, "/bin/mkdir -p {$g['dhcpd_chroot_path']}/var/run\n");
-    fwrite($fd, "/bin/mkdir -p {$g['dhcpd_chroot_path']}/usr\n");
-    fwrite($fd, "/bin/mkdir -p {$g['dhcpd_chroot_path']}/lib\n");
-    fwrite($fd, "/bin/mkdir -p {$g['dhcpd_chroot_path']}/run\n");
-    $status = `/sbin/mount -t devfs | /usr/bin/grep "{$g['dhcpd_chroot_path']}/dev"`;
-    if (!trim($status)) {
-        fwrite($fd, "/sbin/mount -t devfs devfs {$g['dhcpd_chroot_path']}/dev\n");
+    $dirs = array('/dev', '/etc', '/lib', '/run', '/usr', '/usr/local/sbin', '/var/db', '/var/run');
+
+    foreach ($dirs as $dir) {
+        mwexecf('/bin/mkdir -p %s', "{$g['dhcpd_chroot_path']}{$dir}");
     }
-    fwrite($fd, "/usr/sbin/chown -R dhcpd:dhcpd {$g['dhcpd_chroot_path']}\n");
-    fclose($fd);
 
-    mwexec('/bin/sh /tmp/dhcpd.sh');
+    if (mwexecf('/sbin/mount -uw %s', "{$g['dhcpd_chroot_path']}/dev", true)) {
+        mwexecf('/sbin/mount -t devfs devfs %s', "{$g['dhcpd_chroot_path']}/dev");
+    }
 
-    if ($family == "all" || $family == "inet") {
+    mwexecf('/usr/sbin/chown -R dhcpd:dhcpd %s', $g['dhcpd_chroot_path']);
+
+    if ($family == 'all' || $family == 'inet') {
         services_dhcpdv4_configure();
     }
 
-    if ($family == "all" || $family == "inet6") {
+    if ($family == 'all' || $family == 'inet6') {
         services_dhcpdv6_configure($blacklist);
         services_radvd_configure($blacklist);
     }