Skip to content

Commit

Permalink
Fix installer getting.
Browse files Browse the repository at this point in the history
The installer, on fresh installs, initially looks for a route assuming
eth0.  Not all installations will have the route command available either
leaving a potential issue in regards to dhcp.
  • Loading branch information
mastacontrola committed Dec 31, 2016
1 parent be69d85 commit ff86c83
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/common/input.sh
Expand Up @@ -44,7 +44,7 @@ if [[ $guessdefaults == 1 ]]; then
strSuggestedSubMask=$(mask2cidr $strSuggestedSubMask)
fi
submask=$strSuggestedSubMask
strSuggestedRoute=$(ip route | grep -E eth0 | tail -n1 | cut -d' ' -f3 | tr -d [:blank:])
strSuggestedRoute=$(ip route | grep -E ${strSuggestedInterface} | tail -n1 | cut -d' ' -f3 | tr -d [:blank:])
if [[ -z $strSuggestedRoute ]]; then
strSuggestedRoute=$(route -n | grep "^.*U.*${strSuggestedInterface}$" | tail -n1)
strSuggestedRoute=$(echo ${strSuggestedRoute:16:16} | tr -d [:blank:])
Expand Down
2 changes: 1 addition & 1 deletion packages/web/lib/fog/system.class.php
Expand Up @@ -53,7 +53,7 @@ private static function _versionCompare()
public function __construct()
{
self::_versionCompare();
define('FOG_VERSION', '19');
define('FOG_VERSION', '82');
define('FOG_SCHEMA', 244);
define('FOG_BCACHE_VER', 111);
define('FOG_SVN_REVISION', 6052);
Expand Down
2 changes: 1 addition & 1 deletion packages/web/management/languages/messages.pot
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-12-30 19:13-0500\n"
"POT-Creation-Date: 2016-12-30 20:19-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down

0 comments on commit ff86c83

Please sign in to comment.