compatibility with some aws kernels

serverfarmer · Aug 20, 2019 · 707e8de · 707e8de
1 parent 23f07ca
commit 707e8de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scripts/checks/all.sh b/scripts/checks/all.sh
@@ -3,7 +3,7 @@
 /opt/heartbeat/scripts/checks/services.sh
 /opt/heartbeat/scripts/checks/space.sh
 
-if [ ! -f /proc/1/environ ] || ! grep -q lxc /proc/1/environ; then
+if [ ! -f /proc/1/environ ] || ! grep -q lxc /proc/1/environ 2>/dev/null; then
 	/opt/heartbeat/scripts/facts/list-docker-containers.sh
 	/opt/heartbeat/scripts/facts/list-libvirt-machines.sh
 	/opt/heartbeat/scripts/facts/storage/list-mapped-luks-partitions.sh |tr '[:upper:]' '[:lower:]'

diff --git a/setup.sh b/setup.sh
@@ -3,7 +3,7 @@
 mkdir -p /var/cache/heartbeat /etc/heartbeat
 
 if [ "`uname`" = "Linux" ] \
-	&& ! grep -q lxc /proc/1/environ \
+	&& ! grep -q lxc /proc/1/environ 2>/dev/null \
 	&& ! grep -q /var/cache/heartbeat /etc/fstab; then
 	echo "setting up cache directory"
 	echo "tmpfs /var/cache/heartbeat tmpfs noatime,size=16m 0 0" >>/etc/fstab
@@ -13,7 +13,7 @@ fi
 /opt/heartbeat/scripts/setup/configure-hostname.sh
 /opt/heartbeat/scripts/setup/configure-symlinks.sh
 
-if [ ! -f /proc/1/environ ] || ! grep -q lxc /proc/1/environ; then
+if [ ! -f /proc/1/environ ] || ! grep -q lxc /proc/1/environ 2>/dev/null; then
 	echo "setting up SMART configuration files and templates"
 	/opt/heartbeat/scripts/setup/configure-smart.sh