Merge remote-tracking branch 'upstream/dev' into dev

scripts/wk/hw/diags.py

@@ -1549,7 +1549,7 @@ def screensaver(name):
 
   # Switch pane to fullscreen and start screensaver
   tmux.zoom_pane()
-  exe.run_program(cmd, check=False, pipe=False)
+  exe.run_program(cmd, check=False, pipe=False, stderr=subprocess.PIPE)
   tmux.zoom_pane()
 
 

setup/linux/include_x/airootfs/etc/skel/.config/openbox/menu.xml

@@ -16,7 +16,7 @@
             <execute>gparted</execute>
         </action> </item>
         <item label="GSmartControl"> <action name="Execute">
-            <execute>gsmartcontrol</execute>
+            <execute>gsmartcontrol_polkit</execute>
         </action> </item>
         <item label="Network Diagnostics"> <action name="Execute">
             <execute>urxvt -title "Network Diagnostics" -hold -e hw-diags-network</execute>

setup/linux/include_x/airootfs/etc/skel/.update_conky

@@ -26,7 +26,7 @@ sed -i -r "s/#Network//" "${CONFIG_NEW}"
 
 # Fix under i3
 if ! [[ "${I3SOCK:-}" == "" ]]; then
-  sed -i -r 's/(own_window_type)(.*)(desktop)/\1\2override/' "${CONKY_NEW}"
+  sed -i -r 's/(own_window_type)(.*)(desktop)/\1\2override/' "${CONFIG_NEW}"
 fi
 
 # Replace config if there were changes