From 114038bbab07780fb9ecd2aa7dc7665e3d492e95 Mon Sep 17 00:00:00 2001 From: Tom Mortensen Date: Tue, 20 Jun 2017 13:03:09 -0700 Subject: [PATCH] Undo previous change of updating both syslinux/syslinux.cfg and EFI/boot/syslinux.cfg. Instead now EFI/boot/syslinux.cfg consists of a single line: include /syslinux/syslinux.cfg Hence only need to maintain single copy. --- plugins/dynamix.vm.manager/VMajax.php | 2 -- plugins/dynamix/include/update.file.php | 3 --- 2 files changed, 5 deletions(-) diff --git a/plugins/dynamix.vm.manager/VMajax.php b/plugins/dynamix.vm.manager/VMajax.php index 12107f58f..da505dc47 100644 --- a/plugins/dynamix.vm.manager/VMajax.php +++ b/plugins/dynamix.vm.manager/VMajax.php @@ -388,7 +388,6 @@ switch ($action) { if ($boolModded) { // Write Changes to syslinux.cfg file_put_contents('/boot/syslinux/syslinux.cfg', implode('', $arrSyslinuxCfg)); - @copy('/boot/syslinux/syslinux.cfg', '/boot/EFI/boot/syslinux.cfg'); } $arrResponse = ['success' => true, 'modified' => $boolModded]; @@ -412,7 +411,6 @@ switch ($action) { if ($boolModded) { // Write Changes to syslinux.cfg file_put_contents('/boot/syslinux/syslinux.cfg', implode('', $arrSyslinuxCfg)); - @copy('/boot/syslinux/syslinux.cfg', '/boot/EFI/boot/syslinux.cfg'); } $arrResponse = ['success' => true, 'modified' => $boolModded]; diff --git a/plugins/dynamix/include/update.file.php b/plugins/dynamix/include/update.file.php index e04d7bb83..c28dded76 100644 --- a/plugins/dynamix/include/update.file.php +++ b/plugins/dynamix/include/update.file.php @@ -14,9 +14,6 @@ write_log("Saving file $file"); exec("mkdir -p ".escapeshellarg(dirname($file))); file_put_contents($file, str_replace(["\r\n","\r"], "\n", $_POST['text'])); -// syslinux.cfg hack -if ($file == "/boot/syslinux/syslinux.cfg") - @copy("/boot/syslinux/syslinux.cfg", "/boot/EFI/boot/syslinux.cfg"); // discard settings $save = false; ?>