Merge branch 'master' of git://git.qubes-os.org/marmarek/linux-utils

archlinux/PKGBUILD

@@ -33,7 +33,7 @@ md5sums=() #generate with 'makepkg -g'
 
 build() {
 
-for source in qrexec-lib udev Makefile; do
+for source in qrexec-lib udev qmemman Makefile; do
   (ln -s $srcdir/../$source $srcdir/$source)
 done
 

archlinux/PKGBUILD-qubes-vm-utils.install

@@ -1,14 +1,23 @@
 
 ## arg 1:  the new package version
 post_install() {
-	ldconfig
+  ldconfig
+  if [ -r /etc/qubes-release ]; then
+      # dom0
+      /bin/systemctl enable qubes-meminfo-writer-dom0.service > /dev/null 2>&1
+  else
+      # VM
+      /bin/systemctl enable qubes-meminfo-writer.service > /dev/null 2>&1
+  fi
 }
 
 post_upgrade() {
-	ldconfig
+  ldconfig
 }
 
 post_remove() {
-	ldconfig
+  ldconfig
+  /bin/systemctl disable qubes-meminfo-writer.service > /dev/null 2>&1
+  /bin/systemctl disable qubes-meminfo-writer.service > /dev/null 2>&1
 }