From 1b814ffd2c1db5da06b3d1744e4ad3e744320fe1 Mon Sep 17 00:00:00 2001
From: Chris Moos <chris@tech9computers.com>
Date: Sat, 25 Apr 2015 00:39:33 -0700
Subject: [PATCH] Add safe_format_and_mount to hyperkube image.

* Add volume format script into hyperkube image.
* Fix issue with format script on non-redhat platforms.
---
 cluster/images/hyperkube/Dockerfile              |  2 ++
 cluster/images/hyperkube/Makefile                |  1 +
 .../saltbase/salt/helpers/safe_format_and_mount  | 16 +++++++++-------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/cluster/images/hyperkube/Dockerfile b/cluster/images/hyperkube/Dockerfile
index b0794a9f517..8483b351cb8 100644
--- a/cluster/images/hyperkube/Dockerfile
+++ b/cluster/images/hyperkube/Dockerfile
@@ -8,3 +8,5 @@ RUN chmod a+rx /hyperkube
 
 COPY master-multi.json /etc/kubernetes/manifests-multi/master.json
 COPY master.json /etc/kubernetes/manifests/master.json
+COPY safe_format_and_mount /usr/share/google/safe_format_and_mount
+RUN chmod a+rx /usr/share/google/safe_format_and_mount
diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile
index 74dc193e5c1..ac6a0d48321 100644
--- a/cluster/images/hyperkube/Makefile
+++ b/cluster/images/hyperkube/Makefile
@@ -3,6 +3,7 @@
 VERSION=v0.14.2
 
 all:
+	cp ../../saltbase/salt/helpers/safe_format_and_mount .
 	curl -O https://storage.googleapis.com/kubernetes-release/release/${VERSION}/bin/linux/amd64/hyperkube
 	docker build -t gcr.io/google_containers/hyperkube:${VERSION} .
 	gcloud preview docker push gcr.io/google_containers/hyperkube:${VERSION}
diff --git a/cluster/saltbase/salt/helpers/safe_format_and_mount b/cluster/saltbase/salt/helpers/safe_format_and_mount
index 9675a69103d..90be230ad28 100644
--- a/cluster/saltbase/salt/helpers/safe_format_and_mount
+++ b/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 $?
\ No newline at end of file
+exit $?