Use bootlocal.sh

YungSang · Feb 14, 2014 · 1baf9fc · 1baf9fc
1 parent 4cef587
commit 1baf9fc
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 26 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,4 @@
-boot2docker.box: boot2docker.iso
-	VBoxManage closemedium disk persistent.vmdk
-	-VBoxManage closemedium disk persistent2.vmdk
-	rm -rf persistent2.vmdk
-	VBoxManage clonehd persistent.vmdk persistent2.vmdk
+boot2docker.box: boot2docker.iso template.json vagrantfile_virtualbox.tpl files/*
 	packer build template.json
 
 boot2docker.iso:

diff --git a/files/vagrant_key.pub → files/bootlocal.sh b/files/vagrant_key.pub → files/bootlocal.sh
@@ -1 +1,11 @@
+#!/bin/sh
+
+mkdir -p /home/docker/.ssh
+chmod 0700 /home/docker/.ssh
+
+cat <<KEY >/home/docker/.ssh/authorized_keys
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
+KEY
+chmod 0600 /home/docker/.ssh/authorized_keys
+
+chown -R docker:staff /home/docker/.ssh
diff --git a/files/sshd_config b/files/sshd_config
diff --git a/persistent.vmdk b/persistent.vmdk
diff --git a/template.json b/template.json
@@ -11,11 +11,7 @@
         "guest_additions_mode": "disable",
         "guest_os_type": "Linux26_64",
         "vboxmanage": [
-            ["modifyvm", "{{.Name}}", "--memory", "1024"],
-            ["modifyvm", "{{.Name}}", "--boot1", "dvd", "--boot2", "disk"],
-            ["storageattach", "{{.Name}}", "--storagectl", "IDE Controller",
-                "--port", "0", "--device", "0",
-                "--type", "hdd", "--medium", "persistent2.vmdk"]
+            ["modifyvm", "{{.Name}}", "--memory", "1024"]
         ]
     }],
 
@@ -26,10 +22,10 @@
     }, {
         "type": "shell",
         "inline": [
-            "sudo cp /tmp/sshd_config /var/lib/boot2docker/ssh/sshd_config",
-            "sudo cp /tmp/vagrant_key.pub /var/lib/boot2docker/ssh/docker_authorized_keys",
-            "sudo chown docker:docker /var/lib/boot2docker/ssh/docker_authorized_keys",
-            "sudo chmod 0600 /var/lib/boot2docker/ssh/docker_authorized_keys"
+            "mkfs.ext4 -F -L boot2docker-data /dev/sda",
+            "sudo /etc/rc.d/automount",
+            "sudo cp /tmp/bootlocal.sh /var/lib/boot2docker/bootlocal.sh",
+            "sudo chmod +x /var/lib/boot2docker/bootlocal.sh"
         ]
     }],