Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'network-wait-fix'

Browse Source 
* network-wait-fix:
  Increase upgrades-status-notify verbosity
  network: fix waiting for VM network uplink
This commit is contained in:
Marek Marczykowski-Górecki 2021-01-03 06:11:48 +01:00
commit e71edb8584
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init/functions
View File

@ -138,6 +138,12 @@ get_qubes_managed_iface() {
local mac local mac
local qubes_iface local qubes_iface
mac="$(qubesdb-read /qubes-mac 2> /dev/null)" mac="$(qubesdb-read /qubes-mac 2> /dev/null)"
if [ -z "$mac" ]; then
# no qubes-managed network interface
return
fi
# Load the module explicitly here, to avoid waiting for udev doing that
[ -e /sys/module/xen_netfront ] || modprobe xen-netfront || :
qubes_iface="$(get_iface_from_mac "$mac")" qubes_iface="$(get_iface_from_mac "$mac")"
if [ "x$qubes_iface" != "x" ]; then if [ "x$qubes_iface" != "x" ]; then
echo "$qubes_iface" echo "$qubes_iface"

2
package-managers/upgrades-installed-check
View File

@ -15,7 +15,7 @@ if [ -e /etc/system-release ]; then
yum=yum yum=yum
fi fi
# shellcheck disable=SC2034 # shellcheck disable=SC2034
yum_output="$($yum -yq check-update 2>&1)" yum_output="$($yum -yq check-update)"
exit_code="$?" exit_code="$?"
[ "$exit_code" -eq 100 ] && echo "false" && exit 0 [ "$exit_code" -eq 100 ] && echo "false" && exit 0
[ "$exit_code" -eq 0 ] && echo "true" [ "$exit_code" -eq 0 ] && echo "true"

2
package-managers/upgrades-status-notify
View File

@ -2,7 +2,7 @@
set -e set -e
upgrades_installed="$(/usr/lib/qubes/upgrades-installed-check 2>&1)" upgrades_installed="$(/usr/lib/qubes/upgrades-installed-check)"
if [ "$upgrades_installed" = "true" ]; then if [ "$upgrades_installed" = "true" ]; then
/usr/lib/qubes/qrexec-client-vm dom0 qubes.NotifyUpdates /bin/sh -c 'echo 0' /usr/lib/qubes/qrexec-client-vm dom0 qubes.NotifyUpdates /bin/sh -c 'echo 0'