Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm

misc/block_add_change

@@ -16,6 +16,11 @@ if [ -n "`ls -A /sys/$DEVPATH/holders 2> /dev/null`" ]; then
     xenstore-rm "$XS_KEY"
     exit 0
 fi
+# ... and "empty" loop devices
+if [ "$MAJOR" -eq 7 -a ! -d /sys/$DEVPATH/loop ]; then
+    xenstore-rm "$XS_KEY"
+    exit 0
+fi
 
 # Special case for CD
 if [ "$ID_TYPE" = "cd" ]; then
@@ -26,6 +31,11 @@ if [ "$ID_TYPE" = "cd" ]; then
     fi
     MODE=r
 fi
+
+# Special description for loop devices
+if [ -d /sys/$DEVPATH/loop ]; then
+    DESC=$(cat /sys/$DEVPATH/loop/backing_file)
+fi
 xenstore-write "$XS_KEY/desc" "$DESC" "$XS_KEY/size" "$SIZE" "$XS_KEY/mode" "$MODE"
 
 # Make sure that block backend is loaded

misc/qubes_block.rules

@@ -6,9 +6,6 @@ SUBSYSTEM!="block", GOTO="qubes_block_end"
 # Skip xen-blkfront devices
 ENV{MAJOR}=="202", GOTO="qubes_block_end"
 
-# Skip loop devices
-ENV{MAJOR}=="7", GOTO="qubes_block_end"
-
 # Skip device-mapper devices
 ENV{MAJOR}=="253", GOTO="qubes_block_end"
 

vm-systemd/qubes-sysinit.sh

@@ -4,6 +4,7 @@
 DEFAULT_ENABLED_NETVM="network-manager qubes-network"
 DEFAULT_ENABLED_PROXYVM="meminfo-writer qubes-network qubes-firewall qubes-netwatcher"
 DEFAULT_ENABLED_APPVM="meminfo-writer cups"
+DEFAULT_ENABLED_TEMPLATEVM=$DEFAULT_ENABLED_APPVM
 DEFAULT_ENABLED="meminfo-writer"
 
 XS_READ=/usr/bin/xenstore-read
@@ -30,6 +31,7 @@ TYPE=`$XS_READ qubes_vm_type 2> /dev/null`
 [ "$TYPE" == "AppVM" ] && DEFAULT_ENABLED=$DEFAULT_ENABLED_APPVM
 [ "$TYPE" == "NetVM" ] && DEFAULT_ENABLED=$DEFAULT_ENABLED_NETVM
 [ "$TYPE" == "ProxyVM" ] && DEFAULT_ENABLED=$DEFAULT_ENABLED_PROXYVM
+[ "$TYPE" == "TemplateVM" ] && DEFAULT_ENABLED=$DEFAULT_ENABLED_TEMPLATEVM
 
 # Enable default services
 for srv in $DEFAULT_ENABLED; do