[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 82da7072aea05e7c93552f185d60703be72a21b6

Sylvain B beuc at fusionforge.org
Sun Apr 13 18:48:34 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_3 has been updated
       via  82da7072aea05e7c93552f185d60703be72a21b6 (commit)
       via  8b63e97faf2192e2a24370c703c784891313ac97 (commit)
      from  d3bebb24a31f2bb519302a42f637f0604bcfe7d9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 82da7072aea05e7c93552f185d60703be72a21b6
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sun Apr 13 18:48:00 2014 +0200

    VM: update vm names with distro

diff --git a/vm/packer/fusionforge-dev-centos.json b/vm/packer/fusionforge-dev-centos.json
index f651f5d..68fda8b 100644
--- a/vm/packer/fusionforge-dev-centos.json
+++ b/vm/packer/fusionforge-dev-centos.json
@@ -50,7 +50,8 @@
           "--cpus",
           "1"
         ]
-      ]
+      ],
+      "vm_name": "fusionforge-dev-centos"
     }
   ],
   "post-processors": [
diff --git a/vm/packer/fusionforge-dev-debian.json b/vm/packer/fusionforge-dev-debian.json
index b2a04e3..aa34f39 100644
--- a/vm/packer/fusionforge-dev-debian.json
+++ b/vm/packer/fusionforge-dev-debian.json
@@ -58,7 +58,7 @@
 					"1"
 				]
 			],
-			"vm_name": "fusionforge-dev"
+			"vm_name": "fusionforge-dev-debian"
 		},
 		{
 			"type": "qemu",
@@ -73,7 +73,7 @@
 			"http_directory": "http",
 			"ssh_username": "root",
 			"ssh_password": "vagrant",
-			"vm_name": "fusionforge-dev",
+			"vm_name": "fusionforge-dev-debian",
 			"boot_command": [
 				"<esc><wait>",
 				"auto ",

commit 8b63e97faf2192e2a24370c703c784891313ac97
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sun Apr 13 18:47:35 2014 +0200

    VM: fix ownership for /home/vagrant/

diff --git a/vm/packer/scripts/vagrant.sh b/vm/packer/scripts/vagrant.sh
index 43aea07..2334993 100755
--- a/vm/packer/scripts/vagrant.sh
+++ b/vm/packer/scripts/vagrant.sh
@@ -2,7 +2,7 @@
 
 # Create the user vagrant with password vagrant,
 # and avoid /bin/sh aka dash under Debian
-useradd vagrant -s /bin/bash
+useradd vagrant -s /bin/bash --create-home
 echo 'vagrant'|passwd --stdin vagrant
 echo 'vagrant ALL=NOPASSWD:ALL' > /etc/sudoers.d/vagrant
 chmod 0440 /etc/sudoers.d/vagrant
@@ -12,7 +12,7 @@ chmod 0440 /etc/sudoers.d/vagrant
 mkdir -pm 700 /home/vagrant/.ssh
 wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys
 chmod 0600 /home/vagrant/.ssh/authorized_keys
-chown -R vagrant /home/vagrant/.ssh
+chown -R vagrant: /home/vagrant/.ssh
 
 # Install a copy for root, so we can 'vagrant ssh -- -l root'
 mkdir -pm 700 /root/.ssh

-----------------------------------------------------------------------

Summary of changes:
 vm/packer/fusionforge-dev-centos.json |    3 ++-
 vm/packer/fusionforge-dev-debian.json |    4 ++--
 vm/packer/scripts/vagrant.sh          |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list