From: Frank Brehm <frank.brehm@profitbricks.com>
Date: Wed, 19 Nov 2014 10:53:15 +0000 (+0100)
Subject: Bugfixing in files/rc.local
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=66cd9a385d7147bd7593624732404eb7be7aacd8;p=profitbricks%2Fjenkins-build-scripts.git

Bugfixing in files/rc.local
---

diff --git a/create-grml-squash.sh b/create-grml-squash.sh
index 9730026..5c022b2 100755
--- a/create-grml-squash.sh
+++ b/create-grml-squash.sh
@@ -51,7 +51,7 @@ fi
 ORIG_IMG="/mnt/grml/live/grml64-full/grml64-full.squashfs"
 TARGET_DIR="/var/tmp/grml"
 
-PACKAGES="infiniband-diags opensm bc git libpcre3 mbuffer lsscsi bind9-host bind9utils megacli lsitools"
+PACKAGES="infiniband-diags opensm bc git libpcre3 mbuffer lsscsi bind9-host bind9utils megacli lsitools storage-tools"
 
 MY_BASE=$(basename $0 )
 MY_DIR=$( readlink -f $( dirname $0 ) )
diff --git a/files/rc.local b/files/rc.local
index 824a176..0d6b1eb 100755
--- a/files/rc.local
+++ b/files/rc.local
@@ -36,7 +36,7 @@ if [[ -d /sys/class/infiniband ]] ; then
 fi
 
 wget http://mgmt/liveboot-turbas/grml.sh -O /tmp/grml.sh ||true
-if [[ -f /tmp/grml.sh -a -s /tmp/grml.sh ]] ; then
+if [[ -f /tmp/grml.sh && -s /tmp/grml.sh ]] ; then
     chmod 755 /tmp/grml.sh ||true
     /tmp/grml.sh ||true
 fi