diff --git a/emhttp/plugins/dynamix/SysDrivers.page b/emhttp/plugins/dynamix/SysDrivers.page index 1e988e43d..e2ba6b5ed 100644 --- a/emhttp/plugins/dynamix/SysDrivers.page +++ b/emhttp/plugins/dynamix/SysDrivers.page @@ -144,7 +144,7 @@ function textsave(module,remove = false) { var i=module ; $('#text'+module).prop('disabled', true); $('#save'+module).attr('hidden', true); - if (remove) x = "" ; else var x = document.getElementById("text" + module).value; + var x = (remove) ? "" : document.getElementById("text" + module).value; $.post('/webGui/include/SysDrivers.php',{table:'update',module:module,conf:x},function(data){ if(data) { formHasUnsavedChanges=false; diff --git a/emhttp/plugins/dynamix/include/SysDrivers.php b/emhttp/plugins/dynamix/include/SysDrivers.php index ee30b9200..6b3c5654a 100644 --- a/emhttp/plugins/dynamix/include/SysDrivers.php +++ b/emhttp/plugins/dynamix/include/SysDrivers.php @@ -42,7 +42,8 @@ switch ($_POST['table']) { case 't1load': $list = file_get_contents($sysdrvfile) ; $arrModules = json_decode($list,TRUE) ; - $init = file_get_contents($sysdrvinit) ; + var $init = false; + if (is_file($sysdrvinit)) $init = file_get_contents($sysdrvinit); $html = ""._("Driver").""._("Description").""._("State").""._("Type").""._("Modprobe.d config file").""; $html .= "" ; diff --git a/etc/rc.d/rc.local b/etc/rc.d/rc.local index 056c7e8f9..86f620e2a 100755 --- a/etc/rc.d/rc.local +++ b/etc/rc.d/rc.local @@ -15,9 +15,6 @@ # reclaim 1.6M of microcode files that are no longer needed rm -rf /kernel -# rc.samba now executable -chmod +x /etc/rc.d/rc.samba - # Start WireGuard if [ -x /etc/rc.d/rc.wireguard ]; then /etc/rc.d/rc.wireguard start @@ -136,7 +133,7 @@ else # Install any extra packages if [ -d /boot/extra ]; then logger "Installing /boot/extra packages" - ( cd /boot/extra ; find -maxdepth 1 -type f -exec upgradepkg --install-new {} \; ) + ( cd /boot/extra ; find -maxdepth 1 -type f -exec sh -c 'upgradepkg --terse --install-new "$1" | logger' -- {} \; ) fi # Install plugins logger "Installing plugins" diff --git a/etc/rc.d/rc.samba b/etc/rc.d/rc.samba old mode 100644 new mode 100755