Merge pull request #7330 from chrismoos/volume_format_script_updates

Add safe_format_and_mount to hyperkube image.

cluster/saltbase/salt/helpers/safe_format_and_mount

@@ -23,12 +23,14 @@
 FSCK=fsck.ext4
 MOUNT_OPTIONS="discard,defaults"
 MKFS="mkfs.ext4 -E lazy_itable_init=0,lazy_journal_init=0 -F"
-if grep -q '6\..' /etc/redhat-release; then
-  # lazy_journal_init is not recognized in redhat 6
-  MKFS="mkfs.ext4 -E lazy_itable_init=0 -F"
-elif grep -q '7\..' /etc/redhat-release; then
-  FSCK=fsck.xfs
-  MKFS=mkfs.xfs
+if [ -e /etc/redhat-release ]; then
+    if grep -q '6\..' /etc/redhat-release; then
+      # lazy_journal_init is not recognized in redhat 6
+      MKFS="mkfs.ext4 -E lazy_itable_init=0 -F"
+    elif grep -q '7\..' /etc/redhat-release; then
+      FSCK=fsck.xfs
+      MKFS=mkfs.xfs
+    fi
 fi
 
 LOGTAG=safe_format_and_mount
@@ -142,4 +144,4 @@ function try_mount() {
 }
 
 try_mount
-exit $?
+exit $?