From 4e8525f6fb2c0ef7174bd041ce700374ee03de37 Mon Sep 17 00:00:00 2001
From: Matthew Farrellee <matt@redhat.com>
Date: Wed, 10 Jul 2013 16:18:23 -0400
Subject: [PATCH] Merge Ubuntu and Fedora instructions for first-boot

Implements: blueprint merge-dib-hadoop-elements
Change-Id: Ie795be74adbbc6c742b2ffeb6e93ef3b93781aa3
---
 elements/hadoop_fedora/first-boot.d/99-setup | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/elements/hadoop_fedora/first-boot.d/99-setup b/elements/hadoop_fedora/first-boot.d/99-setup
index 75a87fd..bd4e732 100755
--- a/elements/hadoop_fedora/first-boot.d/99-setup
+++ b/elements/hadoop_fedora/first-boot.d/99-setup
@@ -1,13 +1,22 @@
 #!/bin/bash
+
+# Common
+chown root:root /mnt
+mkdir -p /var/run/hadoop ; chown hadoop:hadoop /var/run/hadoop
+mkdir -p /mnt/log/hadoop ; chown hadoop:hadoop /mnt/log/hadoop
+
+# Unique to Ubuntu
+#mkdir /run/hadoop
+#chown hadoop:hadoop /run/hadoop/
+#mkdir -p /home/ubuntu/.ssh
+#touch /home/ubuntu/.ssh/authorized_keys
+#chown -R ubuntu:ubuntu /home/ubuntu
+
+# Unique to Fedora
 sleep 10
 rm /etc/resolv.conf
 service network restart
 chown -R ec2-user:ec2-user /home/ec2-user
 chown -R ec2-user:ec2-user /etc/hadoop
-mkdir -p /var/run/hadoop
-chown root:root /mnt
-mkdir -p /mnt/log/hadoop
-chown hadoop:hadoop /var/run/hadoop
-chown hadoop:hadoop /mnt/log/hadoop
 #TODO: configure iptables (https://bugs.launchpad.net/savanna/+bug/1195744)
 iptables -F