Merge remote-tracking branch 'upstream/master'

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;

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 =  "<thead><tr><th><b>"._("Driver")."</th><th><b>"._("Description")."</th><th data-value='System|Inuse|Custom|Disabled|\"Kernel - Inuse\"'><b>"._("State")."</th><th><b>"._("Type")."</th><th><b>"._("Modprobe.d config file")."</th></tr></thead>";
         $html .= "<tbody>" ;
      

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"