From ab16e6a91a15f4124ec5b618194ef5535bf54417 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Mon, 2 Jan 2012 04:27:22 +0100
Subject: [PATCH] vm: hide unwanted warnings from xenstore-read

---
 appvm/qubes_core_appvm          | 2 +-
 proxyvm/init.d/qubes_firewall   | 2 +-
 proxyvm/init.d/qubes_netwatcher | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/appvm/qubes_core_appvm b/appvm/qubes_core_appvm
index 9e0d68c..c6c62f7 100755
--- a/appvm/qubes_core_appvm
+++ b/appvm/qubes_core_appvm
@@ -60,7 +60,7 @@ start()
 		echo Back to life.
 	fi
 
-	start_meminfo_writer=$(/usr/bin/xenstore-read qubes-service/meminfo-writer)
+	start_meminfo_writer=$(/usr/bin/xenstore-read qubes-service/meminfo-writer 2>/dev/null)
 	if [ "$start_meminfo_writer" != "0" ]; then
 		MEM_CHANGE_THRESHOLD_KB=30000
 		MEMINFO_DELAY_USEC=100000
diff --git a/proxyvm/init.d/qubes_firewall b/proxyvm/init.d/qubes_firewall
index 459e0c4..4c76e53 100755
--- a/proxyvm/init.d/qubes_firewall
+++ b/proxyvm/init.d/qubes_firewall
@@ -11,7 +11,7 @@ PIDFILE=/var/run/qubes/qubes_firewall.pid
 start()
 {
     type=$(/usr/bin/xenstore-read qubes_vm_type)
-    start_firewall=$(/usr/bin/xenstore-read qubes-service/qubes-firewall)
+    start_firewall=$(/usr/bin/xenstore-read qubes-service/qubes-firewall 2> /dev/null)
     if [ -z "$start_firewall" ] && [ "$type" == "ProxyVM" ] || [ "$start_firewall" == "1" ]; then
         echo -n $"Starting Qubes Firewall monitor:"
         /sbin/ethtool -K eth0 sg off
diff --git a/proxyvm/init.d/qubes_netwatcher b/proxyvm/init.d/qubes_netwatcher
index b5cc1e3..c60f8a2 100755
--- a/proxyvm/init.d/qubes_netwatcher
+++ b/proxyvm/init.d/qubes_netwatcher
@@ -11,7 +11,7 @@ PIDFILE=/var/run/qubes/qubes_netwatcher.pid
 start()
 {
     type=$(/usr/bin/xenstore-read qubes_vm_type)
-    start_netwatcher=$(/usr/bin/xenstore-read qubes-service/qubes-netwatcher)
+    start_netwatcher=$(/usr/bin/xenstore-read qubes-service/qubes-netwatcher 2>/dev/null)
     if [ -z "$start_netwatcher" ] && [ "$type" == "ProxyVM" ] || [ "$start_netwatcher" == "1" ]; then
         echo -n $"Starting Qubes Network monitor:"
         /sbin/ethtool -K eth0 sg off