diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2011-02-27 16:21:27 -0500 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2011-02-27 16:21:27 -0500 |
commit | 4e0cb56eb5d556023fd35208fc1ac3eefa105bdc (patch) | |
tree | 599d123783d88a671dcb4d546ff1e2fdc3a96c67 /etc | |
parent | 0c4f8ca831e158de0c27b0e7c7c5f821eccd36d0 (diff) | |
parent | cfaf6e69bd956ccb7a46066f3176820346f96451 (diff) | |
download | pfsense-4e0cb56eb5d556023fd35208fc1ac3eefa105bdc.zip pfsense-4e0cb56eb5d556023fd35208fc1ac3eefa105bdc.tar.gz |
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/pkg-utils.inc | 7 | ||||
-rw-r--r-- | etc/phpshellsessions/gitsync | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index 3f901e2..a97de3a 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -453,8 +453,11 @@ function pkg_fetch_recursive($pkgname, $filename, $dependlevel = 0, $base_url = if (($g['platform'] == "nanobsd") || ($g['platform'] == "embedded")) { $pkgtmpdir = "/usr/bin/env PKG_TMPDIR=/root/ "; - $pkgstaging = "-t /root/tmp/instmp.XXXXXX"; - $fetchdir = "/root/tmp/"; + $pkgstagingdir = "/root/tmp"; + if (!is_dir($pkgstagingdir)) + mkdir($pkgstagingdir); + $pkgstaging = "-t {$pkgstagingdir}/instmp.XXXXXX"; + $fetchdir = $pkgstagingdir; } else { $fetchdir = $g['tmp_path']; } diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync index aaca2c7..0ff40e1 100644 --- a/etc/phpshellsessions/gitsync +++ b/etc/phpshellsessions/gitsync @@ -16,6 +16,7 @@ conf_mount_rw(); $GIT_REPO="http://gitweb.pfsense.org/pfsense/mainline.git"; $CODIR = "/root/pfsense/"; +global $g; global $argv; global $command_split; @@ -29,7 +30,10 @@ if(!file_exists("/usr/local/bin/git")) { echo "Cannot find git, fetching..."; if (($g['platform'] == "nanobsd") || ($g['platform'] == "embedded")) { $pkgtmpdir = "/usr/bin/env PKG_TMPDIR=/root/ "; - $pkgstaging = "-t /root/tmp/instmp.XXXXXX"; + $pkgstagingdir = "/root/tmp"; + if (!is_dir($pkgstagingdir)) + mkdir($pkgstagingdir); + $pkgstaging = "-t {$pkgstagingdir}/instmp.XXXXXX"; } system("{$pkgtmpdir}/usr/sbin/pkg_add {$pkgstaging} -r git"); } |