[Fusionforge-commits] FusionForge branch master updated. f9dc474de0066b27ef6adfb73ee5fe42a9b935ae

Sylvain Beucler beuc-inria at fusionforge.org
Tue Feb 4 17:57:13 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  f9dc474de0066b27ef6adfb73ee5fe42a9b935ae (commit)
       via  93dda027cc35d96a9bf291d5775ab6ac99d76299 (commit)
       via  a696bbdb61d430f16cf83a650a19b88d2a2edb75 (commit)
      from  eeded280163c584567b5a91cd1377d773b9073e9 (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 f9dc474de0066b27ef6adfb73ee5fe42a9b935ae
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Feb 4 17:54:51 2014 +0100

    VM: simplify packer recipe (notably, enable root account)

diff --git a/tools/VM-bootstrap/README b/tools/VM-bootstrap/README
index 2573fa1..ec8c7f7 100644
--- a/tools/VM-bootstrap/README
+++ b/tools/VM-bootstrap/README
@@ -25,6 +25,7 @@ Debug fusionforge.sh:
 
 
 Inspiration:
+- http://docs.vagrantup.com/v2/boxes/base.html
 - https://github.com/jedi4ever/veewee/tree/master/templates/Debian-7.3.0-amd64-netboot
 - https://github.com/ffuenf/vagrant-boxes/tree/master/packer/debian-7.3.0-amd64
 - https://github.com/puppetlabs/puppet-vagrant-boxes/tree/master/definitions/debian-70rc1-x64-vf503
diff --git a/tools/VM-bootstrap/fusionforge-dev.json b/tools/VM-bootstrap/fusionforge-dev.json
index f2c6cb1..437023c 100644
--- a/tools/VM-bootstrap/fusionforge-dev.json
+++ b/tools/VM-bootstrap/fusionforge-dev.json
@@ -11,18 +11,9 @@
 				"scripts/base.sh",
 				"scripts/vagrant.sh",
 				"scripts/virtualbox.sh",
-				"scripts/console-utils.sh",
-				"scripts/fusionforge.sh",
+				"scripts/fusionforge-source.sh",
 				"scripts/cleanup.sh"
-			],
-			"override": {
-				"virtualbox-iso": {
-					"execute_command": "echo 'vagrant'|sudo -S bash '{{.Path}}'"
-				},
-				"qemu": {
-					"execute_command": "echo 'vagrant'|sudo -S bash '{{.Path}}'"
-				}
-			}
+			]
 		}
 	],
 	"builders": [
@@ -42,9 +33,9 @@
 			"iso_checksum": "2ed8a7ec7ef3abe59b825f7c8d7176322b87341800277c70dce807c5c9ab1c8f18a9e677766d2a12df334024fe27580cf208a305afaf09e96cfe9e762e4f94df",
 			"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",
-			"ssh_username": "vagrant",
+			"ssh_username": "root",
 			"ssh_password": "vagrant",
-			"shutdown_command": "echo 'vagrant'|sudo -S poweroff",
+			"shutdown_command": "poweroff",
 			"guest_additions_mode": "disable",
 			"virtualbox_version_file": ".vbox_version",
 			"vboxmanage": [
@@ -69,13 +60,13 @@
 			"iso_checksum": "4a5fa01c81cc300f4729136e28ebe600",
 			"iso_checksum": "2ed8a7ec7ef3abe59b825f7c8d7176322b87341800277c70dce807c5c9ab1c8f18a9e677766d2a12df334024fe27580cf208a305afaf09e96cfe9e762e4f94df",
 			"iso_checksum_type": "sha512",
-			"shutdown_command": "echo 'vagrant'|sudo -S poweroff",
+			"shutdown_command": "poweroff",
 			"disk_size": 10140,
 			"format": "qcow2",
 			"headless": false,
 			"accelerator": "kvm",
 			"http_directory": "http",
-			"ssh_username": "vagrant",
+			"ssh_username": "root",
 			"ssh_password": "vagrant",
 			"vm_name": "fusionforge-dev",
 			"boot_command": [
diff --git a/tools/VM-bootstrap/http/preseed.cfg b/tools/VM-bootstrap/http/preseed.cfg
index aafd36b..1ec31c6 100755
--- a/tools/VM-bootstrap/http/preseed.cfg
+++ b/tools/VM-bootstrap/http/preseed.cfg
@@ -12,23 +12,10 @@ d-i keyboard-configuration/xkb-keymap select us
 # skip displaying a list if there is more than one interface.
 d-i netcfg/choose_interface select auto
 
-# To pick a particular interface instead:
-#d-i netcfg/choose_interface select eth1
-
 # If you have a slow dhcp server and the installer times out waiting for
 # it, this might be useful.
 #d-i netcfg/dhcp_timeout string 60
 
-# If you prefer to configure the network manually, uncomment this line and
-# the static network configuration below.
-#d-i netcfg/disable_dhcp boolean true
-
-# If you want the preconfiguration file to work on systems both with and
-# without a dhcp server, uncomment these lines and the static network
-# configuration below.
-#d-i netcfg/dhcp_failed note
-#d-i netcfg/dhcp_options select Configure network manually
-
 # Static network configuration.
 #d-i netcfg/get_nameservers string 192.168.1.1
 #d-i netcfg/get_ipaddress string 192.168.1.42
@@ -42,11 +29,6 @@ d-i netcfg/choose_interface select auto
 #d-i netcfg/get_hostname string vagrant
 #d-i netcfg/get_domain string vagrantup.com
 
-# Disable that annoying WEP key dialog.
-d-i netcfg/wireless_wep string
-# The wacky dhcp hostname that some ISPs use as a password of sorts.
-#d-i netcfg/dhcp_hostname string radish
-
 # If non-free firmware is needed for the network or other hardware, you can
 # configure the installer to always try to load it, without prompting. Or
 # change to false to disable asking.
@@ -168,7 +150,7 @@ d-i partman/confirm_nooverwrite boolean true
 ### Account setup
 # Skip creation of a root account (normal user account will be able to
 # use sudo).
-d-i passwd/root-login boolean false
+#d-i passwd/root-login boolean false
 # Alternatively, to skip creation of a normal user account.
 #d-i passwd/make-user boolean false
 
@@ -220,7 +202,7 @@ tasksel tasksel/first multiselect standard
 #tasksel tasksel/desktop multiselect kde, xfce
 
 # Individual additional packages to install
-d-i pkgsel/include string openssh-server ntp acpid  sudo bzip2 rsync  emacs23-nox vim
+d-i pkgsel/include string openssh-server ntp acpid gpm  sudo bzip2 rsync  emacs23-nox vim
 
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade
@@ -244,37 +226,9 @@ popularity-contest popularity-contest/participate boolean false
 # if no other operating system is detected on the machine.
 d-i grub-installer/only_debian boolean true
 
-# This one makes grub-installer install to the MBR if it also finds some other
-# OS, which is less safe as it might not be able to boot that other OS.
-d-i grub-installer/with_other_os boolean true
-
-# Alternatively, if you want to install to a location other than the mbr,
-# uncomment and edit these lines:
-#d-i grub-installer/only_debian boolean false
-#d-i grub-installer/with_other_os boolean false
-#d-i grub-installer/bootdev  string (hd0,0)
-# To install grub to multiple disks:
-#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)
-
-# Optional password for grub, either in clear text
-#d-i grub-installer/password password r00tme
-#d-i grub-installer/password-again password r00tme
-# or encrypted using an MD5 hash, see grub-md5-crypt(8).
-#d-i grub-installer/password-crypted password [MD5 hash]
-
-### Finishing up the installation
-# During installations from serial console, the regular virtual consoles
-# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next
-# line to prevent this.
-#d-i finish-install/keep-consoles boolean true
-
 # Avoid that last message about the install being complete.
 d-i finish-install/reboot_in_progress note
 
-# This will prevent the installer from ejecting the CD during the reboot,
-# which is useful in some situations.
-#d-i cdrom-detect/eject boolean false
-
 # This is how to make the installer shutdown when finished, but not
 # reboot into the installed system.
 #d-i debian-installer/exit/halt boolean true
@@ -290,6 +244,9 @@ d-i finish-install/reboot_in_progress note
 #   debconf-get-selections --installer > file
 #   debconf-get-selections >> file
 
+# Controlled server environment with minimal dependencies:
+di base-installer/install-recommends false
+
 
 #### Advanced options
 ### Running custom commands during the installation
@@ -303,14 +260,14 @@ d-i finish-install/reboot_in_progress note
 # This first command is run as early as possible, just after
 # preseeding is read.
 # Prevent packaged version of VirtualBox Guest Additions being installed:
-d-i preseed/early_command string sed -i \
-  '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \
-  /usr/lib/pre-pkgsel.d/20install-hwpackages
+#d-i preseed/early_command string sed -i \
+#  '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \
+#  /usr/lib/pre-pkgsel.d/20install-hwpackages
 
 # This command is run just before the install finishes, but when there is
 # still a usable /target directory. You can chroot to /target and use it
 # directly, or use the apt-install and in-target commands to easily install
 # packages and run commands in the target system.
-
-# Controlled server environment with minimal dependencies:
-di base-installer/install-recommends false
+d-i preseed/late_command string \
+  echo %vagrant ALL=NOPASSWD:ALL > /target/etc/sudoers.d/vagrant; \
+  in-target chmod 0440 /etc/sudoers.d/vagrant
diff --git a/tools/VM-bootstrap/scripts/console-utils.sh b/tools/VM-bootstrap/scripts/console-utils.sh
deleted file mode 100644
index 49966f4..0000000
--- a/tools/VM-bootstrap/scripts/console-utils.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Text-mode mouse support
-apt-get -y --force-yes install gpm
diff --git a/tools/VM-bootstrap/scripts/fusionforge.sh b/tools/VM-bootstrap/scripts/fusionforge-source.sh
old mode 100755
new mode 100644
similarity index 57%
rename from tools/VM-bootstrap/scripts/fusionforge.sh
rename to tools/VM-bootstrap/scripts/fusionforge-source.sh
index f5fe949..753cdf2
--- a/tools/VM-bootstrap/scripts/fusionforge.sh
+++ b/tools/VM-bootstrap/scripts/fusionforge-source.sh
@@ -1,24 +1,8 @@
-# Install sources
-apt-get -y --force-yes install bzr
-cd /root/
-bzr checkout https://fusionforge.org/anonscm/bzr/deb-packaging/unstable fusionforge
-
-# Update system
-# Not done here, it makes the .box too big (1.5GB)
-# yes | /root/fusionforge/tools/VM-scripts/update.sh
-
-# Install dependencies
-apt-get -y --force-yes install moreutils
-wget http://ftp.fr.debian.org/debian/pool/main/l/loggerhead/loggerhead_1.19~bzr479-3_all.deb
-aptitude install gdebi-core
-gdebi --non-interactive loggerhead_1.19~bzr479-3_all.deb
-
 # Help text for users
 cat <<'EOF' > /etc/issue
 Debian GNU/Linux + FusionForge Dev VM \l
 
-Login with vagrant/vagrant and use 'sudo -i' to become root.
-To install a graphical environment, run "/root/fusionforge/tools/VM-scripts/install-gui.sh".
+Login with root/vagrant
 Default keyboard layout is US QWERTY.
 (Change it with 'dpkg-reconfigure keyboard-configuration --pri=high')
 Default language is English.
@@ -26,6 +10,15 @@ Default language is English.
 
 EOF
 
-# Install convenience script/documentation for root to use:
+# 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/
+bzr checkout https://fusionforge.org/anonscm/bzr/deb-packaging/unstable fusionforge
+
+# Update system
+# Not done here, it makes the .box too big (1.5GB)
+# yes | /root/fusionforge/tools/VM-scripts/update.sh
diff --git a/tools/VM-bootstrap/scripts/vagrant.sh b/tools/VM-bootstrap/scripts/vagrant.sh
index abf6d03..d940cd0 100755
--- a/tools/VM-bootstrap/scripts/vagrant.sh
+++ b/tools/VM-bootstrap/scripts/vagrant.sh
@@ -1,21 +1,29 @@
 #!/bin/bash
 
 # Create the user vagrant with password vagrant
-useradd -G sudo -p $(perl -e'print crypt("vagrant", "vagrant")') -m -s /bin/bash -N vagrant
+# cf. http/preseed.cfg
+#useradd -G sudo -p $(perl -e'print crypt("vagrant", "vagrant")') -m -s /bin/bash -N vagrant
 
-# Set up sudo
-echo %vagrant ALL=NOPASSWD:ALL > /etc/sudoers.d/vagrant
-chmod 0440 /etc/sudoers.d/vagrant
+# Set up sudo - cf. http/preseed.cfg:late_command
+#echo %vagrant ALL=NOPASSWD:ALL > /etc/sudoers.d/vagrant
+#chmod 0440 /etc/sudoers.d/vagrant
 
 # Installing vagrant keys
 # Cf. http://docs.vagrantup.com/v2/boxes/base.html
 mkdir /home/vagrant/.ssh
-chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
+chmod 700 .
 wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
-chmod 600 /home/vagrant/.ssh/authorized_keys
-chown -R vagrant /home/vagrant/.ssh
+chmod 600 authorized_keys
+chown -R vagrant .
+
+# Install a copy for root, so we can 'vagrant ssh -- -l root'
+mkdir /root/.ssh
+cd /root/.ssh
+chmod 700 .
+wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+chmod 600 authorized_keys
 
 # Install NFS for Vagrant
-apt-get -y --force-yes update
-apt-get -y --force-yes install nfs-common
+#apt-get -y --force-yes update
+#apt-get -y --force-yes install nfs-common
diff --git a/tools/VM-bootstrap/scripts/virtualbox.sh b/tools/VM-bootstrap/scripts/virtualbox.sh
index 5bd90e3..f0936ef 100755
--- a/tools/VM-bootstrap/scripts/virtualbox.sh
+++ b/tools/VM-bootstrap/scripts/virtualbox.sh
@@ -1,3 +1,3 @@
-if test -f /home/vagrant/.vbox_version ; then
+if test -f .vbox_version ; then
   apt-get -y install --no-install-recommends linux-headers-amd64 virtualbox-guest-dkms
 fi
diff --git a/tools/VM-scripts/build.sh b/tools/VM-scripts/build.sh
index 63a4fb0..02fe550 100755
--- a/tools/VM-scripts/build.sh
+++ b/tools/VM-scripts/build.sh
@@ -14,7 +14,7 @@
 
 #set -x
 
-# Pupulate the repo
+# Populate the repo
 rm -rf /root/debian-repository
 mkdir -p /root/debian-repository
 
diff --git a/tools/VM-scripts/update.sh b/tools/VM-scripts/update.sh
index ead8693..3f06eef 100755
--- a/tools/VM-scripts/update.sh
+++ b/tools/VM-scripts/update.sh
@@ -7,8 +7,6 @@
 # This script will update the system and the checked-out branch to the
 # latest state to be tested.
 
-# Prerequisite : running 'sh scripts/configure-scripts.sh' once
-
 # First, make sure the Debian distro is up-to-date
 aptitude update
 aptitude -y dist-upgrade
@@ -17,6 +15,12 @@ aptitude -y dist-upgrade
 aptitude -y install mini-dinstall dput devscripts equivs
 mk-build-deps -i /root/fusionforge/src/debian/control -t 'aptitude -y' -r
 
+# "Backport" recent dependency
+wget http://ftp.fr.debian.org/debian/pool/main/l/loggerhead/loggerhead_1.19~bzr479-3_all.deb
+aptitude install gdebi-core
+gdebi --non-interactive loggerhead_1.19~bzr479-3_all.deb
+
+
 set -e
 
 cd /root/fusionforge

commit 93dda027cc35d96a9bf291d5775ab6ac99d76299
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Feb 4 14:00:43 2014 +0100

    VM: simplify initial setup

diff --git a/tools/VM-bootstrap/README b/tools/VM-bootstrap/README
index 349628b..2573fa1 100644
--- a/tools/VM-bootstrap/README
+++ b/tools/VM-bootstrap/README
@@ -1,16 +1,17 @@
 Create the FusionForge Dev VM using packer.io
 
+
 Use in Vagrant:
 
-  vagrant init fusionforge-dev http://fusionforge.fusionforge.org/sandbox/fusionforge-dev.box
-  # Optionaly modify 'Vagrantfile', e.g. enable 'vb.gui'.
-  vagrant up
+See https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/Virtual_machine_development_environment
+
 
 Simple rebuild of the .box:
 
   packer build -only=virtualbox-iso fusionforge-dev.json
   packer build -only=qemu fusionforge-dev.json  # lacks .box export support as of 2014-01
 
+
 Debug fusionforge.sh:
 
   sed -e 's:"scripts/fusionforge.sh",::' -e 's/fusionforge-dev.box/bare.box/' fusionforge-dev.json > bare.json
@@ -22,6 +23,7 @@ Debug fusionforge.sh:
   rm bare.box bare.json
   # Now you can launch an official rebuild.
 
+
 Inspiration:
 - https://github.com/jedi4ever/veewee/tree/master/templates/Debian-7.3.0-amd64-netboot
 - https://github.com/ffuenf/vagrant-boxes/tree/master/packer/debian-7.3.0-amd64
diff --git a/tools/VM-bootstrap/file/Desktop/README.desktop b/tools/VM-bootstrap/file/Desktop/README.desktop
new file mode 100644
index 0000000..dae15fd
--- /dev/null
+++ b/tools/VM-bootstrap/file/Desktop/README.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=README
+Type=Link
+URL=https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/Virtual_machine_development_environment
+Icon=text-html
diff --git a/tools/VM-bootstrap/file/Desktop/README.html b/tools/VM-bootstrap/file/Desktop/README.html
deleted file mode 100644
index 19e96d8..0000000
--- a/tools/VM-bootstrap/file/Desktop/README.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>FusionForge sandbox</title>
-  </head>
-
-  <body>
-    <h1>FusionForge sandbox</h1>
-
-    <p>Welcome to the FusionForge sandbox.  This VM/appliance is
-    designed to help you get started on development.  It's basically a
-    clean Debian system, with a checkout of the FusionForge code and a
-    few helper scripts.  Those scripts are in the
-    <tt>/root/scripts</tt> directory:</p>
-
-    <ul>
-      <li><tt>update.sh</tt> will update the sources from
-      FusionForge's Subversion repository, and also the currently
-      installed packages.</li>
-      <li><tt>build.sh</tt> builds FusionForge packages from the
-	sources, and stores them in the package repository at
-      <tt>/root/debian-repository</tt>.</li>
-      <li><tt>install.sh</tt> installs those FusionForge packages.
-      This should end up with an up-to-date FusionForge running on <a
-      href="http://forge.local/">http://forge.local/</a>.</li>
-      <li><tt>start-selenium.sh</tt> gets and runs Selenium, which
-      is needed for the testsuite.</li>
-      <li><tt>run-testsuite.sh</tt> actually starts the
-      testsuite.</li>
-      <li><tt>install-gui.sh</tt> sets up an X11 graphical environment.</li>
-    </ul>
-
-    <p>The actual source code is stored under
-    <tt>/root/fusionforge-trunk</tt>, so that's where you should do
-    the changes you want to test.</p>
-
-    <h2>Running everything on the VM</h2>
-
-    <p>If you run <tt>install-gui.sh</tt>, then you get a graphical
-    desktop environment on the VM.  To build and install from sources,
-    run the “Build + inst” script (there's an icon on the desktop).
-    You can then use <a
-    href="http://forge.local/">http://forge.local/</a>, with the
-    administrator's login being “admin” and its password being
-    “myadmin”.  To run the testsuite, launch Selenium and <em>keep it
-    running</em> (possibly iconized) while you launch the “Run
-    testsuite”.</p>
-
-    <h2>Running remotely</h2>
-
-    <p>If you don't want to install a full GUI on the VM, you can also
-    run the interesting things remotely through SSH.  Depending on the
-    configuration of your VM, the network settings may change, but the
-    VM displays its IP address at boot time, so you can <tt>ssh
-    root at 192.168.x.x</tt> and work in there.  Note that Selenium needs
-    an X11 display (since it drives a graphical web browser), so
-    you'll need to run <tt>ssh -X root at 192.168.x.x
-    start-selenium.sh</tt> (note the <tt>-X</tt>).</p>
-  </body>
-</html>
diff --git a/tools/VM-bootstrap/file/Desktop/build-and-install.desktop b/tools/VM-bootstrap/file/Desktop/build-and-install.desktop
index 4ea1b33..362af72 100644
--- a/tools/VM-bootstrap/file/Desktop/build-and-install.desktop
+++ b/tools/VM-bootstrap/file/Desktop/build-and-install.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Build + inst
-Exec=sh -c "/root/scripts/build.sh ; /root/scripts/install.sh ; echo Press Enter... ; read i"
+Exec=sh -c "/root/fusionforge/tools/VM-scripts/build.sh ; /root/fusionforge/tools/VM-scripts/install.sh ; echo Press Enter... ; read i"
 Terminal=true
 Type=Application
diff --git a/tools/VM-bootstrap/file/Desktop/run-testsuite.desktop b/tools/VM-bootstrap/file/Desktop/run-testsuite.desktop
index 7df80a4..a4961dd 100644
--- a/tools/VM-bootstrap/file/Desktop/run-testsuite.desktop
+++ b/tools/VM-bootstrap/file/Desktop/run-testsuite.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Run testsuite
-Exec=sh -c "/root/scripts/run-testsuite.sh ; echo Press Enter... ; read i"
+Exec=sh -c "/root/fusionforge/tools/VM-scripts/run-testsuite.sh ; echo Press Enter... ; read i"
 Terminal=true
 Type=Application
diff --git a/tools/VM-bootstrap/scripts/fusionforge.sh b/tools/VM-bootstrap/scripts/fusionforge.sh
index db45670..f5fe949 100755
--- a/tools/VM-bootstrap/scripts/fusionforge.sh
+++ b/tools/VM-bootstrap/scripts/fusionforge.sh
@@ -3,13 +3,9 @@ apt-get -y --force-yes install bzr
 cd /root/
 bzr checkout https://fusionforge.org/anonscm/bzr/deb-packaging/unstable fusionforge
 
-# Install scripts
-#wget -q -O - "https://fusionforge.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=fusionforge/fusionforge.git;a=blob_plain;f=tools/VM-scripts/configure-scripts.sh;hb=HEAD" | sh -s trunk
-ln -s fusionforge/tools/VM-scripts scripts
-
 # Update system
 # Not done here, it makes the .box too big (1.5GB)
-# yes | scripts/update.sh
+# yes | /root/fusionforge/tools/VM-scripts/update.sh
 
 # Install dependencies
 apt-get -y --force-yes install moreutils
@@ -22,7 +18,7 @@ cat <<'EOF' > /etc/issue
 Debian GNU/Linux + FusionForge Dev VM \l
 
 Login with vagrant/vagrant and use 'sudo -i' to become root.
-To install a graphical environment, run "/root/scripts/install-gui.sh".
+To install a graphical environment, run "/root/fusionforge/tools/VM-scripts/install-gui.sh".
 Default keyboard layout is US QWERTY.
 (Change it with 'dpkg-reconfigure keyboard-configuration --pri=high')
 Default language is English.
diff --git a/tools/VM-scripts/README.txt b/tools/VM-scripts/README.txt
index 011c884..822d28a 100644
--- a/tools/VM-scripts/README.txt
+++ b/tools/VM-scripts/README.txt
@@ -1,25 +1 @@
-The initial setup a user should do is :
-
- # cd /root
- # sh .../scripts/configure-scripts.sh BRANCH
-where BRANCH is either 'Branch_5_1' or 'trunk' (without quotes)
-
-This will setup the ~/fusionforge "directory" (actually a link to the
-wanted branch's checked-out copy), that should hold the to-be-tested
-tested contents of the repository.
-
-The 'fusionforge' symlink can be changed to point to another branch
-checkout if you intend to have several branches under test in the same
-VM.
-
-The 'scripts' "directory" is also a symlink to the tools/VM-scripts/
-dir inside the corresponding checked-out branch.
-
-
-For using the other scripts see ~/Desktop/README.html which contains some docs.
-
-See also :
-https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/Virtual_machine_development_environment
-for some more details.
-
--- Olivier Berger
+See https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/Virtual_machine_development_environment
diff --git a/tools/VM-scripts/configure-scripts.sh b/tools/VM-scripts/configure-scripts.sh
deleted file mode 100644
index 8eac0d7..0000000
--- a/tools/VM-scripts/configure-scripts.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-
-# Author : Olivier BERGER <olivier.berger at it-sudparis.eu>
-
-# This script will checkout the needed branch and will setup the
-# scripts symlink to give the correct up-to-date scripts versions to
-# the user
-
-# This script, itself, may need to be brought up-to-date.
-#
-# You may try : 
-#   wget "https://fusionforge.org/scm/viewvc.php/*checkout*/trunk/tools/VM-scripts/configure-scripts.sh?root=fusionforge"
-# to get the latest version from the trunk (replace '/trunk' by
-# '/branches/Branch_5_1' for Branch 5.1's version for instance.
-#
-
-if [ $# -ne 1 ]; then
-    echo "Please provide branch name to work on (Branch_5_1|trunk)"
-    exit 1
-fi
-
-cd $HOME
-
-if [ -f ./fusionforge ]; then
-    if [ ! -L ./fusionforge ]; then
-	echo "You have an existing ./fusionforge file or directory. Stopping."
-	exit 1
-    fi
-fi
-
-BRANCH="$1"
-
-if [ "$BRANCH" = "trunk" -o "$BRANCH" = "Branch_5_1" ]; then
-    if [ -d "./fusionforge-$BRANCH" ]; then
-	echo "Assuming './fusionforge-$BRANCH/' already contains a bzr checkout of the $BRANCH. Please check following output of 'bzr info' :"
-	(cd "./fusionforge-$BRANCH/" && bzr info)
-    else
-	if [ "$BRANCH" = "trunk" ]; then
-	    echo "no 'fusionforge-trunk/' dir found : checking out from SVN's trunk with 'bzr checkout svn://scm.fusionforge.org/svnroot/fusionforge/trunk' :"
-	    bzr checkout svn://scm.fusionforge.org/svnroot/fusionforge/trunk fusionforge-trunk
-	else
-	    echo "no 'fusionforge-$BRANCH/' dir found : checking out from SVN's $BRANCH with 'bzr checkout svn://scm.fusionforge.org/svnroot/fusionforge/branches/$BRANCH' :"
-	    bzr checkout "svn://scm.fusionforge.org/svnroot/fusionforge/branches/$BRANCH" "fusionforge-$BRANCH"
-	fi
-    fi
-else
-    echo "The supplied branch : $BRANCH wasn't recognized. Maybe the script is now outdated"
-    exit 1
-fi
-
-if [ -L ./fusionforge ]; then
-    oldlink=$(ls -ld ./fusionforge)
-    echo "Removing old ./fusionforge link ($oldlink)"
-    rm ./fusionforge
-fi
-
-echo "Creating a link from './fusionforge' to 'fusionforge-$BRANCH'"
-ln -s "fusionforge-$BRANCH" fusionforge
-
-if [ -d scripts ]; then
-    echo "Saving old 'scripts/' dir in 'scripts.old/'."
-    mv scripts scripts.old
-fi
-
-if [ -L ./scripts ]; then
-    oldlink=$(ls -ld ./scripts)
-    echo "Removing old ./scripts link ($oldlink)"
-    rm ./scripts
-fi
-
-if [ -d "fusionforge-$BRANCH/tools/VM-scripts/" ]; then
-    echo "Creating a link from 'fusionforge-$BRANCH/tools/VM-scripts/' to './scripts'."
-    ln -s "fusionforge-$BRANCH/tools/VM-scripts/" scripts
-
-    if [ -L scripts/reload-db.sh ]; then
-	oldlink=$(ls -ld scripts/reload-db.sh)
-	echo "Removing old scripts/reload-db.sh link ($oldlink)"
-	rm scripts/reload-db.sh
-    fi
-
-    echo "Creating a link from 'fusionforge-$BRANCH/tests/func/db_reload.sh' to 'scripts/reload-db.sh'."
-    ln -s "../../tests/func/db_reload.sh" scripts/reload-db.sh
-else
-    echo "Warning: there appears to be no 'fusionforge-$BRANCH/tools/VM-scripts/' directory."
-    echo "You may need to update the contents of the checked-out copy in 'fusionforge-$BRANCH/'."
-fi

commit a696bbdb61d430f16cf83a650a19b88d2a2edb75
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Feb 4 13:59:54 2014 +0100

    VM: shrinking the VM is done by Packer now

diff --git a/tools/VM-scripts/shrink.sh b/tools/VM-scripts/shrink.sh
deleted file mode 100755
index 4e3afbe..0000000
--- a/tools/VM-scripts/shrink.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh
-
-apt-get clean
-aptitude clean
-find /var/cache -type f | xargs rm
-rm -rf /tmp/*
-rm -rf /root/debian-repository
-# Maven2 stuff
-rm -rf /root/.m2/
-rm -f /root/.bzr/repository/obsolete_packs/*
-rm -f /root/fusionforge-trunk/*999*
-rm -f /var/log/*.gz
-rm -f /var/lib/aptitude/pkgstates.old
-
-df -h /
-
-mount -oremount,ro /
-fsck -fpC /dev/sda1
-zerofree -v /dev/sda1
-mount -oremount,rw /
-swapoff -a
-dd if=/dev/zero of=/dev/sda5
-mkswap /dev/sda5

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

Summary of changes:
 tools/VM-bootstrap/README                          |    9 +-
 tools/VM-bootstrap/file/Desktop/README.desktop     |    6 ++
 tools/VM-bootstrap/file/Desktop/README.html        |   61 --------------
 .../file/Desktop/build-and-install.desktop         |    2 +-
 .../file/Desktop/run-testsuite.desktop             |    2 +-
 tools/VM-bootstrap/fusionforge-dev.json            |   21 ++---
 tools/VM-bootstrap/http/preseed.cfg                |   65 +++------------
 tools/VM-bootstrap/scripts/console-utils.sh        |    2 -
 tools/VM-bootstrap/scripts/fusionforge-source.sh   |   24 ++++++
 tools/VM-bootstrap/scripts/fusionforge.sh          |   35 --------
 tools/VM-bootstrap/scripts/vagrant.sh              |   26 ++++--
 tools/VM-bootstrap/scripts/virtualbox.sh           |    2 +-
 tools/VM-scripts/README.txt                        |   26 +-----
 tools/VM-scripts/build.sh                          |    2 +-
 tools/VM-scripts/configure-scripts.sh              |   86 --------------------
 tools/VM-scripts/shrink.sh                         |   23 ------
 tools/VM-scripts/update.sh                         |    8 +-
 17 files changed, 81 insertions(+), 319 deletions(-)
 create mode 100644 tools/VM-bootstrap/file/Desktop/README.desktop
 delete mode 100644 tools/VM-bootstrap/file/Desktop/README.html
 delete mode 100644 tools/VM-bootstrap/scripts/console-utils.sh
 create mode 100644 tools/VM-bootstrap/scripts/fusionforge-source.sh
 delete mode 100755 tools/VM-bootstrap/scripts/fusionforge.sh
 delete mode 100644 tools/VM-scripts/configure-scripts.sh
 delete mode 100755 tools/VM-scripts/shrink.sh


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list