Skip to content

Commit

Permalink
Fix installer checks.
Browse files Browse the repository at this point in the history
The installer doesn't test the boot type used for system services. While
systems might have the systemctl command, it does not mean systemd was
what iniated the services.  Add a test for the boot type (init/systemd)
and use it as a secondary means to ensure we use the correct service handler
for the system on boot. Also, we should allow the user to define if they
want to use systemctl or not.  So this fix adds the init/systemd boot model
tester and checks if the systemctl is set prior or not.
  • Loading branch information
mastacontrola committed Jan 9, 2017
1 parent b2a538c commit 26002ad
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion lib/common/config.sh
Expand Up @@ -29,7 +29,9 @@
[[ -z $sqlserverlist ]] && sqlserverlist="mysql-server mariadb-server mariadb-galera-server MariaDB-server MariaDB-Galera-server"
command -v systemctl >>$workingdir/error_logs/fog_error_${version}.log 2>&1
exitcode=$?
[[ $exitcode -eq 0 ]] && systemctl="yes"
ps -p 1 -o comm= | grep systemd
bootcode=$?
[[ $exitcode -eq 0 && $bootcode -eq 0 && -z $systemctl ]] && systemctl="yes"
if [[ $systemctl == yes ]]; then
initdsrc="../packages/systemd"
initdMCfullname="FOGMulticastManager.service"
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', '10');
define('FOG_VERSION', '11');
define('FOG_SCHEMA', 245);
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: 2017-01-09 17:16-0500\n"
"POT-Creation-Date: 2017-01-09 18:57-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 26002ad

Please sign in to comment.