summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-12-26 16:53:51 -0200
committerRenato Botelho <renato@netgate.com>2016-12-26 16:53:51 -0200
commitc01bdca9ba2ddfed14285ff36e1f6508c4452717 (patch)
tree43e72b67f3017395649765e4c540791c479012a4
parentcded235bc212d63bf7777f3f1d085d6b3b5c1121 (diff)
downloadpfsense-c01bdca9ba2ddfed14285ff36e1f6508c4452717.zip
pfsense-c01bdca9ba2ddfed14285ff36e1f6508c4452717.tar.gz
Exclude /var/empty from tar extract and make sure its permissions are respected when it's created
-rw-r--r--src/etc/inc/system.inc2
-rwxr-xr-xsrc/etc/pfSense-rc1
-rw-r--r--tools/templates/core_pkg/base/metadir/+INSTALL3
3 files changed, 4 insertions, 2 deletions
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index b043361..5df1562 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -1891,7 +1891,7 @@ function system_ntp_configure() {
/* if /var/empty does not exist, create it */
if (!is_dir("/var/empty")) {
- mkdir("/var/empty", 0775, true);
+ mkdir("/var/empty", 0555, true);
}
/* start opentpd, set time now and use /var/etc/ntpd.conf */
diff --git a/src/etc/pfSense-rc b/src/etc/pfSense-rc
index e46ed23..382da91 100755
--- a/src/etc/pfSense-rc
+++ b/src/etc/pfSense-rc
@@ -198,6 +198,7 @@ SWAPDEVICE=`/bin/cat /etc/fstab | /usr/bin/grep swap | /usr/bin/cut -f1`
# make some directories in /var
/bin/mkdir -p $varrunpath /var/log /var/etc /var/db/entropy /var/db/rrd /var/at/jobs/ /var/empty /var/log/nginx 2>/dev/null
+chmod 0555 /var/empty
/bin/rm -rf $varrunpath/*
# Cleanup configuration files from previous instance
diff --git a/tools/templates/core_pkg/base/metadir/+INSTALL b/tools/templates/core_pkg/base/metadir/+INSTALL
index 4f53a35..9dd50ee 100644
--- a/tools/templates/core_pkg/base/metadir/+INSTALL
+++ b/tools/templates/core_pkg/base/metadir/+INSTALL
@@ -27,7 +27,8 @@ chflags -R noschg \
echo "===> Extracting new base tarball"
# Install new base files
-tar -C / -xJPUf /usr/local/share/%%PRODUCT_NAME%%/base.txz
+tar -C / --exclude ./var/empty -xJPUf \
+ /usr/local/share/%%PRODUCT_NAME%%/base.txz
echo "===> Removing static obsoleted files"
OpenPOWER on IntegriCloud