From ddb783cc72000839a906f093f6cb4386e18b85b4 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Tue, 17 Jul 2012 20:28:41 +0400
Subject: [PATCH] [bootstrap] Modified bootstrap solo -> agent

---
 bootstrap/bootstrapbuild.sh     | 23 ++++++++++++-----------
 bootstrap/sync/etc/cron.d/agent |  1 +
 bootstrap/sync/etc/cron.d/solo  |  1 -
 bootstrap/sync/etc/rc.local     |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 bootstrap/sync/etc/cron.d/agent
 delete mode 100644 bootstrap/sync/etc/cron.d/solo

diff --git a/bootstrap/bootstrapbuild.sh b/bootstrap/bootstrapbuild.sh
index d66d87be7..e8b906f77 100755
--- a/bootstrap/bootstrapbuild.sh
+++ b/bootstrap/bootstrapbuild.sh
@@ -41,8 +41,7 @@ INITRD_FS=${BASEDIR}/initrd-fs
 INITRD_LOOP=${BASEDIR}/initrd-loop
 INITRD_MODULES=${BASEDIR}/modules
 
-
-DEBOOTSTRAP_INCLUDE=less,vim,bash,net-tools,isc-dhcp-client,rsyslog,cron,iputils-ping,openssh-server,libhttpclient-ruby,chef
+DEBOOTSTRAP_INCLUDE=less,vim,bash,net-tools,isc-dhcp-client,rsyslog,cron,iputils-ping,openssh-server,ruby-httpclient,ruby-json,ohai
 DEBOOTSTRAP_EXCLUDE=
 
 ORIG=${BASEDIR}/orig
@@ -432,18 +431,19 @@ sed -i -e '/exec/c\exec /sbin/getty -8 -l /usr/bin/autologin 38400 tty1' ${INITR
 echo "Syncing system ..."
 cp -r ${SYNC}/* ${INITRD_LOOP}
 
-echo "Injecting cookbooks and configs for chef-solo ..."
 NAILGUN_DIR=${INITRD_LOOP}/opt/nailgun
 
-mkdir -p ${NAILGUN_DIR}/solo
-cp ${SOLO}/solo.json ${NAILGUN_DIR}/solo/solo.json
-cp ${SOLO}/solo.rb ${NAILGUN_DIR}/solo/solo.rb
+#echo "Injecting cookbooks and configs for chef-solo ..."
+#mkdir -p ${NAILGUN_DIR}/solo
+#cp ${SOLO}/solo.json ${NAILGUN_DIR}/solo/solo.json
+#cp ${SOLO}/solo.rb ${NAILGUN_DIR}/solo/solo.rb
 
-echo "Disabling chef-client ..."
-chroot ${INITRD_LOOP} /usr/sbin/update-rc.d chef-client disable
+#echo "Disabling chef-client ..."
+#chroot ${INITRD_LOOP} /usr/sbin/update-rc.d chef-client disable
 
-mkdir -p ${NAILGUN_DIR}/cookbooks
-cp -r ${REPO}/cookbooks/agent ${NAILGUN_DIR}/cookbooks
+echo "Injecting agent ..."
+mkdir -p ${NAILGUN_DIR}/bin
+cp -r ${REPO}/bin/agent ${NAILGUN_DIR}/bin
 
 echo "Injecting bootstrap ssh key ..."
 mkdir -p ${INITRD_LOOP}/root/.ssh
@@ -459,7 +459,8 @@ rm ${INITRD_LOOP}/etc/apt/sources.list
 # UMOUNTING 
 ###########################
 
-if (mount | grep -q ${INITRD_LOOP}); then
+echo "Trying to umount initrd loop ..."
+if (mount | grep -q `readlink -f ${INITRD_LOOP}`); then
     echo "Umounting ${INITRD_LOOP} ..."
     umount ${INITRD_LOOP}
 fi
diff --git a/bootstrap/sync/etc/cron.d/agent b/bootstrap/sync/etc/cron.d/agent
new file mode 100644
index 000000000..d6ea6db6a
--- /dev/null
+++ b/bootstrap/sync/etc/cron.d/agent
@@ -0,0 +1 @@
+*/5 * * * * root flock -w 0 -o /var/lock/agent.lock -c "/opt/nailgun/bin/agent > /var/log/agent.log 2>&1"
diff --git a/bootstrap/sync/etc/cron.d/solo b/bootstrap/sync/etc/cron.d/solo
deleted file mode 100644
index f6be451de..000000000
--- a/bootstrap/sync/etc/cron.d/solo
+++ /dev/null
@@ -1 +0,0 @@
-*/5 * * * * root flock -w 0 -o /var/lock/chef-solo.lock -c "apt-get update; /usr/bin/chef-solo -l debug -c /opt/nailgun/solo/solo.rb -j /opt/nailgun/solo/solo.json"
diff --git a/bootstrap/sync/etc/rc.local b/bootstrap/sync/etc/rc.local
index 816f05b9e..63a53b6c3 100755
--- a/bootstrap/sync/etc/rc.local
+++ b/bootstrap/sync/etc/rc.local
@@ -2,6 +2,6 @@
 
 apt-get update
 
-flock -w 0 -o /var/lock/chef-solo.lock -c "/usr/bin/chef-solo -l debug -c /opt/nailgun/solo/solo.rb -j /opt/nailgun/solo/solo.json" || true
+flock -w 0 -o /var/lock/agent.lock -c "/opt/nailgun/bin/agent > /var/log/agent.log 2>&1" || true
 
 exit 0