- Added version detection for Ubuntu 14.10 - Fixed a problem with restart o...

Till Brehm

2014-10-27 bc04c3a563378372d8779dac9e307cbb00e12316

- Added version detection for Ubuntu 14.10
- Fixed a problem with restart of services due to the fact that Ubuntu has upstart and systemd installed, but only upstart is working without errors.

 install/lib/install.lib.php

@@ -86,6 +86,9 @@
            $mainver = array_filter($mainver);
            $mainver = current($mainver).'.'.next($mainver);
            switch ($mainver){
            case "14.10":
                $relname = "(Utopic Unicorn)";
                break;
            case "14.04":
                $relname = "(Trusty Tahr)";
                break;

 install/lib/installer_base.lib.php

@@ -2306,15 +2306,15 @@

    public function getinitcommand($servicename, $action, $init_script_directory = ''){
        global $conf;
        // systemd
        if(is_executable('/bin/systemd') || is_executable('/usr/bin/systemctl')){
            return 'systemctl '.$action.' '.$servicename.'.service';
        }
        // upstart
        if(is_executable('/sbin/initctl')){
            exec('/sbin/initctl version 2>/dev/null | /bin/grep -q upstart', $retval['output'], $retval['retval']);
            if(intval($retval['retval']) == 0) return 'service '.$servicename.' '.$action;
        }
        // systemd
        if(is_executable('/bin/systemd') || is_executable('/usr/bin/systemctl')){
            return 'systemctl '.$action.' '.$servicename.'.service';
        }
        // sysvinit
        if($init_script_directory == '') $init_script_directory = $conf['init_scripts'];
        if(substr($init_script_directory, -1) === '/') $init_script_directory = substr($init_script_directory, 0, -1);

 server/lib/classes/monitor_tools.inc.php

@@ -62,6 +62,9 @@
                $mainver = array_filter($mainver);
                $mainver = current($mainver).'.'.next($mainver);
                switch ($mainver){
                case "14.10":
                    $relname = "(Utopic Unicorn)";
                    break;
                case "14.04":
                    $relname = "(Trusty Tahr)";
                    break;

 server/lib/classes/system.inc.php

@@ -1721,15 +1721,15 @@

    function getinitcommand($servicename, $action, $init_script_directory = ''){
        global $conf;
        // systemd
        if(is_executable('/bin/systemd') || is_executable('/usr/bin/systemctl')){
            return 'systemctl '.$action.' '.$servicename.'.service';
        }
        // upstart
        if(is_executable('/sbin/initctl')){
            exec('/sbin/initctl version 2>/dev/null | /bin/grep -q upstart', $retval['output'], $retval['retval']);
            if(intval($retval['retval']) == 0) return 'service '.$servicename.' '.$action;
        }
        // systemd
        if(is_executable('/bin/systemd') || is_executable('/usr/bin/systemctl')){
            return 'systemctl '.$action.' '.$servicename.'.service';
        }
        // sysvinit
        if($init_script_directory == '') $init_script_directory = $conf['init_scripts'];
        if(substr($init_script_directory, -1) === '/') $init_script_directory = substr($init_script_directory, 0, -1);