From 3876cf4070735969d60a4c8f28f00200e34c6c79 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Fri, 7 Oct 2011 21:26:55 +0200
Subject: [PATCH] dom0/dom0-updates: check for dom0 updates from cron (#354)

---
 dom0/aux-tools/qubes-dom0-updates.cron |  35 +++++++++++++++++++++++++
 dom0/icons/credits-gnome-icons         |   1 +
 dom0/icons/dom0-update-avail.png       | Bin 0 -> 2511 bytes
 rpm_spec/core-dom0.spec                |   2 ++
 4 files changed, 38 insertions(+)
 create mode 100755 dom0/aux-tools/qubes-dom0-updates.cron
 create mode 100644 dom0/icons/credits-gnome-icons
 create mode 100644 dom0/icons/dom0-update-avail.png

diff --git a/dom0/aux-tools/qubes-dom0-updates.cron b/dom0/aux-tools/qubes-dom0-updates.cron
new file mode 100755
index 00000000..4942ee6c
--- /dev/null
+++ b/dom0/aux-tools/qubes-dom0-updates.cron
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Get normal user name 
+LOCAL_USER=`users | sed -e 's/root *//' | cut -d' ' -f 1`
+PIDFILE=/var/run/qubes/dom0-update-notification.pid
+NOTIFY_ICON=/usr/share/qubes/icons/dom0-update-avail.svg
+
+# Do not allow multiple instances
+[ -r $PIDFILE ] && kill -0 `cat $PIDFILE` && exit 0
+# Teoretically the race can happen here, but this tool will be run once a few
+# hours, so no real problem
+echo $$ > $PIDFILE
+trap "rm $PIDFILE" EXIT
+
+# If no updates available - exit here
+qvm-dom0-updates --check-only && exit
+RETCODE=$?
+
+if [ "$RETCODE" -ne 100 ]; then
+    echo "ERROR: Error checking for updates" >&2
+    exit $RETCODE
+fi
+
+if [ -z "$LOCAL_USER" ]; then
+    echo "ERROR: no user logged in, cannot nofity about updates" >&2
+    exit 1
+fi
+
+# Notify about updates using system tray
+zenity --notification --window-icon=$NOTIFY_ICON --text="Qubes dom0 updates available."
+
+zenity --question --title="Qubes Dom0 updates" \
+      --text="There are updates for dom0 available, do you want to download them now?" || exit 0
+
+su -c "DISPLAY=:0 qvm-dom0-update --gui" $LOCAL_USER
diff --git a/dom0/icons/credits-gnome-icons b/dom0/icons/credits-gnome-icons
new file mode 100644
index 00000000..867d280e
--- /dev/null
+++ b/dom0/icons/credits-gnome-icons
@@ -0,0 +1 @@
+dom0-update-avail icon from gnome-packagekit project distributed under GPLv2
diff --git a/dom0/icons/dom0-update-avail.png b/dom0/icons/dom0-update-avail.png
new file mode 100644
index 0000000000000000000000000000000000000000..95a86cbfc0f400d6113701101e16977baa486f71
GIT binary patch
literal 2511
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
Z{{X31@Lxol?ScRR002ovPDHLkV1iA{v10%L

literal 0
HcmV?d00001

diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index c51490e1..45e9ca25 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -118,6 +118,7 @@ cp ../qrexec/qubes_rpc_multiplexer $RPM_BUILD_ROOT/usr/lib/qubes
 cp aux-tools/qubes.ReceiveUpdates.policy $RPM_BUILD_ROOT/etc/qubes_rpc/policy/qubes.ReceiveUpdates
 cp aux-tools/qubes.ReceiveUpdates $RPM_BUILD_ROOT/etc/qubes_rpc/
 install -D aux-tools/qubes-dom0.modules $RPM_BUILD_ROOT/etc/sysconfig/modules/qubes-dom0.modules
+install -D aux-tools/qubes-dom0-updates.cron $RPM_BUILD_ROOT/etc/cron.daily/qubes-dom0-updates.cron
 
 cp restore/qvm-create-default-dvm $RPM_BUILD_ROOT/usr/bin
 cp restore/xenstore-watch $RPM_BUILD_ROOT/usr/bin/xenstore-watch-qubes
@@ -373,6 +374,7 @@ fi
 /etc/xdg/autostart/qubes-guid.desktop
 /etc/security/limits.d/99-qubes.conf
 /etc/udev/rules.d/99-qubes_block.rules
+/etc/cron.daily/qubes-dom0-updates.cron
 /etc/dracut.conf.d/*
 %dir /usr/share/dracut/modules.d/90qubes-pciback
 /usr/share/dracut/modules.d/90qubes-pciback/*