[Fusionforge-commits] FusionForge branch master updated. 347ce0237396f4b0a1dfe944ba28685e95561025

Sylvain Beucler beuc-inria at fusionforge.org
Mon Feb 10 15:47:53 CET 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, master has been updated
       via  347ce0237396f4b0a1dfe944ba28685e95561025 (commit)
       via  9a8eb5c829426fff30fe402d7f78d13d8680bfcd (commit)
      from  abb1df32db40c184eb9effd795a9226f7a1afaaa (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 347ce0237396f4b0a1dfe944ba28685e95561025
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Feb 10 15:19:31 2014 +0100

    VM: update URLs for Debian 7.4

diff --git a/tools/VM-bootstrap/fusionforge-dev.json b/tools/VM-bootstrap/fusionforge-dev.json
index 12395b3..3eee6fb 100644
--- a/tools/VM-bootstrap/fusionforge-dev.json
+++ b/tools/VM-bootstrap/fusionforge-dev.json
@@ -35,9 +35,9 @@
 			"disk_size": 10140,
 			"guest_os_type": "Debian_64",
 			"http_directory": "http",
-			"iso_checksum": "2ed8a7ec7ef3abe59b825f7c8d7176322b87341800277c70dce807c5c9ab1c8f18a9e677766d2a12df334024fe27580cf208a305afaf09e96cfe9e762e4f94df",
+			"iso_checksum": "db79d463072da26b91c14e08b5a77a77bec9476ad1e5b0d2241228e4d59233f12c74477e77d427e407e1f45da4d2414c76367554352f57480fc7c00dde164028",
 			"iso_checksum_type": "sha512",
-			"iso_url": "http://cdimage.debian.org/cdimage/release/7.3.0/amd64/iso-cd/debian-7.3.0-amd64-netinst.iso",
+			"iso_url": "http://cdimage.debian.org/cdimage/release/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-netinst.iso",
 			"ssh_username": "root",
 			"ssh_password": "vagrant",
 			"shutdown_command": "poweroff",

commit 9a8eb5c829426fff30fe402d7f78d13d8680bfcd
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Feb 10 15:15:33 2014 +0100

    VM: push files directly in root account + add a .bashrc

diff --git a/tools/VM-bootstrap/file/bashrc b/tools/VM-bootstrap/file/bashrc
new file mode 100644
index 0000000..9d8ef4d
--- /dev/null
+++ b/tools/VM-bootstrap/file/bashrc
@@ -0,0 +1,19 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+
+# Note: PS1 and umask are already set in /etc/profile. You should not
+# need this unless you want different defaults for root.
+# PS1='${debian_chroot:+($debian_chroot)}\h:\w\$ '
+# umask 022
+PS1='VAGRANT:\h:\w\$ '
+
+# You may uncomment the following lines if you want `ls' to be colorized:
+export LS_OPTIONS='--color=auto'
+eval "`dircolors`"
+alias ls='ls $LS_OPTIONS'
+alias ll='ls $LS_OPTIONS -l'
+alias l='ls $LS_OPTIONS -lA'
+
+# Some more alias to avoid making mistakes:
+alias rm='rm -i'
+alias cp='cp -i'
+alias mv='mv -i'
diff --git a/tools/VM-bootstrap/fusionforge-dev.json b/tools/VM-bootstrap/fusionforge-dev.json
index 437023c..12395b3 100644
--- a/tools/VM-bootstrap/fusionforge-dev.json
+++ b/tools/VM-bootstrap/fusionforge-dev.json
@@ -3,7 +3,12 @@
 		{
 			"type": "file",
 			"source": "file/Desktop",
-			"destination": "/home/vagrant/"
+			"destination": "/root/"
+		},
+		{
+			"type": "file",
+			"source": "file/bashrc",
+			"destination": "/root/.bashrc"
 		},
 		{
 			"type": "shell",
diff --git a/tools/VM-bootstrap/scripts/fusionforge-source.sh b/tools/VM-bootstrap/scripts/fusionforge-source.sh
index e6afa28..5cedad0 100644
--- a/tools/VM-bootstrap/scripts/fusionforge-source.sh
+++ b/tools/VM-bootstrap/scripts/fusionforge-source.sh
@@ -10,10 +10,6 @@ Default language is English.
 
 EOF
 
-# Install convenience desktop shortcuts for root to use:
-mv /home/vagrant/Desktop /root/Desktop
-chown -R root: /root/Desktop
-
 # Install sources
 apt-get -y --force-yes install bzr
 cd /root/

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

Summary of changes:
 tools/VM-bootstrap/file/bashrc                   |   19 +++++++++++++++++++
 tools/VM-bootstrap/fusionforge-dev.json          |   11 ++++++++---
 tools/VM-bootstrap/scripts/fusionforge-source.sh |    4 ----
 3 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 tools/VM-bootstrap/file/bashrc


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list