diff options
author | Ermal <eri@pfsense.org> | 2014-04-14 13:06:13 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2014-04-14 13:06:28 +0000 |
commit | e61f548f2ca406d1e89af2675d1dbe80e20a24fc (patch) | |
tree | 2a94738d0983ff928bbf013a4221e5a3114522c8 /etc | |
parent | 115b7b81835df0aaf37f305042382911dd719245 (diff) | |
download | pfsense-e61f548f2ca406d1e89af2675d1dbe80e20a24fc.zip pfsense-e61f548f2ca406d1e89af2675d1dbe80e20a24fc.tar.gz |
Get rid of embedded platform. Its time to GC this
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/config.lib.inc | 2 | ||||
-rw-r--r-- | etc/inc/pkg-utils.inc | 2 | ||||
-rw-r--r-- | etc/phpshellsessions/gitsync | 2 | ||||
-rwxr-xr-x | etc/rc | 15 | ||||
-rwxr-xr-x | etc/rc.php_ini_setup | 2 |
5 files changed, 5 insertions, 18 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc index a515e1b..951362f 100644 --- a/etc/inc/config.lib.inc +++ b/etc/inc/config.lib.inc @@ -911,7 +911,7 @@ function get_config_backup_count() { global $config, $g; if (isset($config['system']['backupcount']) && is_numeric($config['system']['backupcount']) && ($config['system']['backupcount'] >= 0)) { return intval($config['system']['backupcount']); - } elseif ($g['platform'] == "embedded" or $g['platform'] == "nanobsd") { + } elseif ($g['platform'] == "nanobsd") { return 5; } else { return 30; diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index d075bab..5a2dfc1 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -501,7 +501,7 @@ function pkg_fetch_recursive($pkgname, $filename, $dependlevel = 0, $base_url = $pkgs = explode(" ", $filename); foreach($pkgs as $filename) { $filename = trim($filename); - if (($g['platform'] == "nanobsd") || ($g['platform'] == "embedded")) { + if ($g['platform'] == "nanobsd") { $pkgtmpdir = "/usr/bin/env PKG_TMPDIR=/root/ "; $pkgstagingdir = "/root/tmp"; if (!is_dir($pkgstagingdir)) diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync index 775eb5e..17f9b09 100644 --- a/etc/phpshellsessions/gitsync +++ b/etc/phpshellsessions/gitsync @@ -90,7 +90,7 @@ if(!file_exists($GIT_BIN)) { if (empty($pkg_info["git"])) { echo "Can't locate git package in pfSense repo. Using FreeBSD pkg repo.."; - if (($g['platform'] == "nanobsd") || ($g['platform'] == "embedded")) { + if (($g['platform'] == "nanobsd")) { $pkgtmpdir = "/usr/bin/env PKG_TMPDIR=/root/ "; $pkgstagingdir = "/root/tmp"; if (!is_dir($pkgstagingdir)) @@ -84,7 +84,7 @@ else fi USE_MFS_TMPVAR=`/usr/bin/grep -c use_mfs_tmpvar /cf/conf/config.xml` - if [ "${PLATFORM}" = "nanobsd" ] || [ "${PLATFORM}" = "embedded" ] || [ ${USE_MFS_TMPVAR} -gt 0 ]; then + if [ "${PLATFORM}" = "nanobsd" ] || [ ${USE_MFS_TMPVAR} -gt 0 ]; then /etc/rc.embedded fi fi @@ -137,8 +137,6 @@ fi if [ "$PLATFORM" = "cdrom" ] ; then # do nothing for cdrom platform -elif [ "$PLATFORM" = "embedded" ] ; then - # do nothing for embedded platform elif [ "$PLATFORM" = "nanobsd" ] || [ ${USE_MFS_TMPVAR} -gt 0 ]; then # Ensure that old-style PKG packages can be persistent across reboots /bin/mkdir -p /root/var/db/pkg @@ -194,12 +192,6 @@ fi /bin/rm -rf /var/tmp/* echo -n "Creating symlinks..." -# Make sure symlink is correct on embedded -if [ "$PLATFORM" = "embedded" ] ; then - /bin/rm /conf - /bin/ln -s /cf/conf/ /conf -fi - # Make sure symlink is correct on nanobsd if [ "$PLATFORM" = "nanobsd" ] ; then /bin/rm /conf @@ -355,11 +347,6 @@ fi /usr/local/sbin/php-fpm -c /usr/local/lib/php.ini -y /usr/local/lib/php-fpm.conf -RD 2>&1 >/dev/null # Launch external configuration loader for supported platforms -if [ "$PLATFORM" = "embedded" ]; then - /usr/local/sbin/fcgicli -f /etc/ecl.php -fi - -# Launch external configuration loader for supported platforms if [ "$PLATFORM" = "nanobsd" ]; then /usr/local/sbin/fcgicli -f /etc/ecl.php fi diff --git a/etc/rc.php_ini_setup b/etc/rc.php_ini_setup index f434f1e..f726ade 100755 --- a/etc/rc.php_ini_setup +++ b/etc/rc.php_ini_setup @@ -81,7 +81,7 @@ else fi # Set upload directory -if [ "$PLATFORM" = "embedded" -o "$PLATFORM" = "nanobsd" ]; then +if [ "$PLATFORM" = "nanobsd" ]; then UPLOADTMPDIR=`/usr/bin/grep upload_path /etc/inc/globals.inc | /usr/bin/cut -d'"' -f4` else UPLOADTMPDIR="/tmp" |