From a62644bb4f9339f90a93c49197af656d381b8897 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sun, 26 Jun 2011 18:57:46 +0200 Subject: [PATCH 1/4] vm: Run ntpd in FirewallVM as clock source for dom0 (#198) --- common/qubes_core | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/qubes_core b/common/qubes_core index 239a684..45d4b7f 100755 --- a/common/qubes_core +++ b/common/qubes_core @@ -71,6 +71,11 @@ start() success echo "" + + type=$(/usr/bin/xenstore-read qubes_vm_type) + if [ "$type" == "ProxyVM" ]; then + /sbin/service ntpd start + fi return 0 } From ae8a8229ee0d81d80bd051ec8173a169a558b76d Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sun, 26 Jun 2011 19:26:44 +0200 Subject: [PATCH 2/4] vm: Check for TemplateVM updates (#198) Just before dom0 updates check for TemplateVM updates and notify the user when there are some. --- common/qubes_download_dom0_updates.sh | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/common/qubes_download_dom0_updates.sh b/common/qubes_download_dom0_updates.sh index 488eecb..cb771a3 100755 --- a/common/qubes_download_dom0_updates.sh +++ b/common/qubes_download_dom0_updates.sh @@ -21,7 +21,26 @@ fi mkdir -p $DOM0_UPDATES_DIR/etc cp /etc/yum.conf $DOM0_UPDATES_DIR/etc/ -echo "Checking for updates..." +# check also for template updates +echo "Checking for template updates..." +TEMPLATEPKGLIST=`yum check-update -q | cut -f 1 -d ' '` +if [ -n "$TEMPLATEPKGLIST" ] && [ "$GUI" = 1 ]; then + TEMPLATE_UPDATE_COUNT=`echo "$TEMPLATEPKGLIST" | wc -w` + NOTIFY_UPDATE_COUNT=`cat /var/run/qubes/template_update_last_notify_count 2> /dev/null` + if [ "$NOTIFY_UPDATE_COUNT" != "$TEMPLATE_UPDATE_COUNT" ]; then + echo -n $TEMPLATE_UPDATE_COUNT > /var/run/qubes/template_update_last_notify_count + NOTIFY_PID=`cat /var/run/qubes/template_update_notify.pid 2> /dev/null` + if [ -z "$NOTIFY_PID" ] || ! kill -0 $NOTIFY_PID; then + NOTIFY_TITLE="Template update" + NOTIFY_TEXT="There are $TEMPLATE_UPDATE_COUNT updates available for TemplateVM" + NOTIFY_INFO="$NOTIFY_TEXT. Start TemplateVM to update it." + ( zenity --notification --text "$NOTIFY_TEXT"; zenity --warning --title "$NOTIFY_TITLE" --text "$NOTIFY_INFO") & + echo $! > /var/run/qubes/template_update_notify.pid + fi + fi +fi + +echo "Checking for dom0 updates..." PKGLIST=`yum --installroot $DOM0_UPDATES_DIR check-update -q | cut -f 1 -d ' '` if [ -z $PKGLIST ]; then From b6f036caf2276b26a064156f4ee8ca7b026ecdc0 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Thu, 30 Jun 2011 01:07:47 +0200 Subject: [PATCH 3/4] dom0+vm: Update VM kernel mechanism (#242) Get kernel from global kernels dir (/var/lib/qubes/vm-kernels), not per-VM. Can be configured by qvm-prefs (kernel parameter). New tool: qvm-set-default-kernel For backward compatibility kernel=None means kernel in VM dir (kernels subdir). (possibly empty) modules.img should be created in it. --- common/fstab | 1 + rpm_spec/core-commonvm.spec | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/common/fstab b/common/fstab index 3bd3474..37b23a9 100644 --- a/common/fstab +++ b/common/fstab @@ -9,6 +9,7 @@ /dev/mapper/dmroot / ext4 defaults,noatime 1 1 /dev/xvdb /rw ext4 noauto,defaults 0 0 /dev/xvdc1 swap swap defaults 0 0 +/dev/xvdd /lib/modules ext3 defaults,ro 0 0 tmpfs /dev/shm tmpfs defaults 0 0 devpts /dev/pts devpts gid=5,mode=620 0 0 sysfs /sys sysfs defaults 0 0 diff --git a/rpm_spec/core-commonvm.spec b/rpm_spec/core-commonvm.spec index d754c36..26d89b1 100644 --- a/rpm_spec/core-commonvm.spec +++ b/rpm_spec/core-commonvm.spec @@ -86,6 +86,9 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/qubes cp qubes_trigger_sync_appmenus.sh $RPM_BUILD_ROOT/usr/lib/qubes/ mkdir -p $RPM_BUILD_ROOT/var/lib/qubes/dom0-updates +mkdir -p $RPM_BUILD_ROOT/lib/firmware +ln -s /lib/modules/firmware $RPM_BUILD_ROOT/lib/firmware/updates + %triggerin -- initscripts cp /var/lib/qubes/serial.conf /etc/init/serial.conf @@ -236,3 +239,4 @@ rm -rf $RPM_BUILD_ROOT /etc/yum/post-actions/qubes_trigger_sync_appmenus.action /usr/lib/qubes/qubes_trigger_sync_appmenus.sh /usr/lib/qubes/qubes_download_dom0_updates.sh +/lib/firmware/updates From 7abf507f6f75b009bf67f9d98d500fc94af958b0 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Thu, 30 Jun 2011 01:27:14 +0200 Subject: [PATCH 4/4] dom0+vm: version 1.6.4 --- version_vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_vm b/version_vm index fdd3be6..9edc58b 100644 --- a/version_vm +++ b/version_vm @@ -1 +1 @@ -1.6.2 +1.6.4