Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core

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

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
 }
 

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

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

version_vm

@@ -1 +1 @@
-1.6.2
+1.6.4