Skip to content

Commit 724391f

Browse files
author
Till Brehm
committed
Merge branch 'mr-498-stable' into 'stable-3.1'
Change remote upgrade to apt-get (#4397) See merge request ispconfig/ispconfig3!1107
2 parents 803c134 + 8e5a73e commit 724391f

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

server/mods-available/remoteaction_core_module.inc.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,16 +172,17 @@ private function _doOsUpdate($action) {
172172
/*
173173
* Do the update
174174
*/
175-
exec("aptitude update");
176-
exec("aptitude safe-upgrade -y");
175+
//Guess this is not wanted here?
176+
//exec("aptitude update");
177+
//exec("aptitude safe-upgrade -y");
177178

178179
//TODO : change this when distribution information has been integrated into server record
179180
if(file_exists('/etc/gentoo-release')) {
180181
exec("glsa-check -f --nocolor affected");
181182
}
182183
else {
183-
exec("aptitude update");
184-
exec("aptitude safe-upgrade -y");
184+
exec("apt-get update");
185+
exec("apt-get -y upgrade");
185186
}
186187

187188
/*
@@ -192,7 +193,7 @@ private function _doOsUpdate($action) {
192193

193194
private function _doIspCUpdate($action) {
194195
global $app;
195-
196+
196197
// Ensure that this code is not executed twice as this would cause a loop in case of a failure
197198
$this->_actionDone($action['action_id'], 'ok');
198199

0 commit comments

Comments
 (0)