[Fusionforge-commits] FusionForge branch 6.0 updated. c4a49473e081fe16dcb3dce7d6b0b889f56c606a

Sylvain Beucler beuc-inria at fusionforge.org
Wed Mar 18 16:13:15 CET 2015


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, 6.0 has been updated
       via  c4a49473e081fe16dcb3dce7d6b0b889f56c606a (commit)
      from  a08e4909c1623bea37372b6d50cc00f5bd1bdf70 (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 c4a49473e081fe16dcb3dce7d6b0b889f56c606a
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Mar 18 16:12:04 2015 +0100

    vm: upgrade to Debian 8

diff --git a/vm/packer/fusionforge-dev-debian.json b/vm/packer/fusionforge-dev-debian.json
index 1120670..25ac96f 100644
--- a/vm/packer/fusionforge-dev-debian.json
+++ b/vm/packer/fusionforge-dev-debian.json
@@ -36,8 +36,8 @@
 			"disk_size": 7168,
 			"guest_os_type": "Debian_64",
 			"http_directory": "http",
-			"iso_url": "http://cdimage.debian.org/cdimage/archive/7.5.0/amd64/iso-cd/debian-7.5.0-amd64-netinst.iso",
-			"iso_checksum": "0a86e2fdef365f8bd626de7e754189291174b86a312c655fa6585eec3c6e5caa5e8f128e37a6989ae8d45743e158191d1b178d76bf338cb4512f0ee4aa9cda3c",
+			"iso_url": "http://cdimage.debian.org/cdimage/jessie_di_rc1/amd64/iso-cd/debian-jessie-DI-rc1-amd64-netinst.iso",
+			"iso_checksum": "734f93daa163924125e48594cf3b4d97cd582a6591db648eb62c6597b87855d603202daca6f8906464b0e13e509687c732d941d5dfac8081f564df980bb16a31",
 			"iso_checksum_type": "sha512",
 			"ssh_username": "root",
 			"ssh_password": "vagrant",
@@ -58,12 +58,12 @@
 					"1"
 				]
 			],
-			"vm_name": "fusionforge-dev-debian"
+			"vm_name": "fusionforge-dev-debian8"
 		},
 		{
 			"type": "qemu",
-			"iso_url": "http://cdimage.debian.org/cdimage/archive/7.5.0/amd64/iso-cd/debian-7.5.0-amd64-netinst.iso",
-			"iso_checksum": "0a86e2fdef365f8bd626de7e754189291174b86a312c655fa6585eec3c6e5caa5e8f128e37a6989ae8d45743e158191d1b178d76bf338cb4512f0ee4aa9cda3c",
+			"iso_url": "http://cdimage.debian.org/cdimage/jessie_di_rc1/amd64/iso-cd/debian-jessie-DI-rc1-amd64-netinst.iso",
+			"iso_checksum": "734f93daa163924125e48594cf3b4d97cd582a6591db648eb62c6597b87855d603202daca6f8906464b0e13e509687c732d941d5dfac8081f564df980bb16a31",
 			"iso_checksum_type": "sha512",
 			"shutdown_command": "poweroff",
 			"disk_size": 7168,
@@ -73,7 +73,7 @@
 			"http_directory": "http",
 			"ssh_username": "root",
 			"ssh_password": "vagrant",
-			"vm_name": "fusionforge-dev-debian",
+			"vm_name": "fusionforge-dev-debian8",
 			"boot_command": [
 				"<esc><wait>",
 				"auto ",
@@ -88,7 +88,7 @@
 	"post-processors": [
 		{
 			"type": "vagrant",
-			"output": "fusionforge-dev-debian.box"
+			"output": "fusionforge-dev-debian8.box"
 		}
 	]
 }
diff --git a/vm/packer/http/preseed.cfg b/vm/packer/http/preseed.cfg
index d7a1278..fbdc1d9 100755
--- a/vm/packer/http/preseed.cfg
+++ b/vm/packer/http/preseed.cfg
@@ -1,33 +1,89 @@
-#### Contents of the preconfiguration file (for wheezy)
+# This based on:
+# https://www.debian.org/releases/stable/example-preseed.txt
+# https://www.debian.org/releases/testing/example-preseed.txt
+# Diff me!
+
+#### Contents of the preconfiguration file (for jessie)
 ### Localization
-# Locale sets language and country.
-d-i debian-installer/locale string en_US.UTF-8
+# Preseeding only locale sets language, country and locale.
+d-i debian-installer/locale string en_US
+# FF: en_US.UTF-8?
+
+# The values can also be preseeded individually for greater flexibility.
+#d-i debian-installer/language string en
+#d-i debian-installer/country string NL
+#d-i debian-installer/locale string en_GB.UTF-8
+# Optionally specify additional locales to be generated.
+#d-i localechooser/supported-locales multiselect en_US.UTF-8, nl_NL.UTF-8
 
 # Keyboard selection.
-#d-i keymap select us
 d-i keyboard-configuration/xkb-keymap select us
+# d-i keyboard-configuration/toggle select No toggling
 
 ### Network configuration
+# Disable network configuration entirely. This is useful for cdrom
+# installations on non-networked devices where the network questions,
+# warning and long timeouts are a nuisance.
+#d-i netcfg/enable boolean false
+
 # netcfg will choose an interface that has link if possible. This makes it
 # 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
+
+# To set a different link detection timeout (default is 3 seconds).
+# Values are interpreted as seconds.
+#d-i netcfg/link_wait_timeout string 10
+
 # 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
+#d-i netcfg/dhcpv6_timeout string 60
+
+# If you prefer to configure the network manually, uncomment this line and
+# the static network configuration below.
+#d-i netcfg/disable_autoconfig 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
+#
+# IPv4 example
 #d-i netcfg/get_ipaddress string 192.168.1.42
 #d-i netcfg/get_netmask string 255.255.255.0
 #d-i netcfg/get_gateway string 192.168.1.1
+#d-i netcfg/get_nameservers string 192.168.1.1
+#d-i netcfg/confirm_static boolean true
+#
+# IPv6 example
+#d-i netcfg/get_ipaddress string fc00::2
+#d-i netcfg/get_netmask string ffff:ffff:ffff:ffff::
+#d-i netcfg/get_gateway string fc00::1
+#d-i netcfg/get_nameservers string fc00::1
 #d-i netcfg/confirm_static boolean true
 
 # Any hostname and domain names assigned from dhcp take precedence over
 # values set here. However, setting the values still prevents the questions
 # from being shown, even if values come from dhcp.
-#d-i netcfg/get_hostname string vagrant
-#d-i netcfg/get_domain string vagrantup.com
+# FF: done in fusionforge-dev-debian.json:
+#d-i netcfg/get_hostname string unassigned-hostname
+#d-i netcfg/get_domain string unassigned-domain
+
+# If you want to force a hostname, regardless of what either the DHCP
+# server returns or what the reverse DNS entry for the IP is, uncomment
+# and adjust the following line.
+#d-i netcfg/hostname string somehost
+
+# 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
@@ -39,6 +95,7 @@ d-i netcfg/choose_interface select auto
 # component for remote installation over SSH. This only makes sense if you
 # intend to perform the remainder of the installation manually.
 #d-i anna/choose_modules string network-console
+#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key
 #d-i network-console/password password r00tme
 #d-i network-console/password-again password r00tme
 
@@ -46,6 +103,8 @@ d-i netcfg/choose_interface select auto
 # If you select ftp, the mirror/country string does not need to be set.
 #d-i mirror/protocol string ftp
 d-i mirror/country string manual
+#d-i mirror/http/hostname string http.us.debian.org
+# FF: use country-independent URL:
 d-i mirror/http/hostname string http.debian.net
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
@@ -55,12 +114,45 @@ d-i mirror/http/proxy string
 # Suite to use for loading installer components (optional).
 #d-i mirror/udeb/suite string testing
 
+### Account setup
+# Skip creation of a root account (normal user account will be able to
+# use sudo).
+#d-i passwd/root-login boolean false
+# Alternatively, to skip creation of a normal user account.
+#d-i passwd/make-user boolean false
+
+# Root password, either in clear text
+# FF: default password for automated install:
+d-i passwd/root-password password vagrant
+d-i passwd/root-password-again password vagrant
+# or encrypted using an MD5 hash.
+#d-i passwd/root-password-crypted password [MD5 hash]
+
+# To create a normal user account.
+# FF: cf. (distro-independently) scripts/vagrant.sh:
+d-i passwd/make-user boolean false
+#d-i passwd/user-fullname string Vagrant User
+#d-i passwd/username string vagrant
+# Normal user's password, either in clear text
+#d-i passwd/user-password password vagrant
+#d-i passwd/user-password-again password vagrant
+# or encrypted using an MD5 hash.
+#d-i passwd/user-password-crypted password [MD5 hash]
+# Create the first user with the specified UID instead of the default.
+#d-i passwd/user-uid string 1010
+
+# The user account will be added to some standard initial groups. To
+# override that, use this.
+d-i passwd/user-default-groups string audio cdrom video admin
+
 ### Clock and time zone setup
 # Controls whether or not the hardware clock is set to UTC.
 d-i clock-setup/utc boolean true
 
 # You may set this to any valid setting for $TZ; see the contents of
 # /usr/share/zoneinfo/ for valid values.
+# FF: use UTC
+#d-i time/zone string US/Eastern
 d-i time/zone string UTC
 
 # Controls whether to use NTP to set the clock during the install
@@ -69,16 +161,24 @@ d-i clock-setup/ntp boolean true
 #d-i clock-setup/ntp-server string ntp.example.com
 
 ### Partitioning
+## Partitioning example
 # If the system has free space you can choose to only partition that space.
+# This is only honoured if partman-auto/method (below) is not set.
 #d-i partman-auto/init_automatically_partition select biggest_free
 
-# Alternatively, you can specify a disk to partition. The device name must
-# be given in traditional non-devfs format.
-# Note: A disk must be specified, unless the system has only one disk.
+# Alternatively, you may specify a disk to partition. If the system has only
+# one disk the installer will default to using that, but otherwise the device
+# name must be given in traditional, non-devfs format (so e.g. /dev/hda or
+# /dev/sda, and not e.g. /dev/discs/disc0/disc).
 # For example, to use the first SCSI/SATA hard disk:
 #d-i partman-auto/disk string /dev/sda
 # In addition, you'll need to specify the method to use.
-# The presently available methods are: "regular", "lvm" and "crypto"
+# The presently available methods are:
+# - regular: use the usual partition types for your architecture
+# - lvm:     use LVM to partition the disk
+# - crypto:  use LVM within an encrypted partition
+# FF: use easily partitionning layout for VMs
+#d-i partman-auto/method string lvm
 d-i partman-auto/method string regular
 
 # If one of the disks that are going to be automatically partitioned
@@ -87,24 +187,17 @@ d-i partman-auto/method string regular
 d-i partman-lvm/device_remove_lvm boolean true
 # The same applies to pre-existing software RAID array:
 d-i partman-md/device_remove_md boolean true
-
 # And the same goes for the confirmation to write the lvm partitions.
 d-i partman-lvm/confirm boolean true
 d-i partman-lvm/confirm_nooverwrite boolean true
 
-
-d-i partman/choose_partition select finish
-d-i partman-auto-lvm/guided_size string max
-
 # You can choose one of the three predefined partitioning recipes:
 # - atomic: all files in one partition
 # - home:   separate /home partition
-# - multi:  separate /home, /usr, /var, and /tmp partitions
+# - multi:  separate /home, /var, and /tmp partitions
 d-i partman-auto/choose_recipe select atomic
-d-i partman/default_filesystem string ext3
 
 # Or provide a recipe of your own...
-# The recipe format is documented in the file devel/partman-auto-recipe.txt.
 # If you have a way to get a recipe file into the d-i environment, you can
 # just point at it.
 #d-i partman-auto/expert_recipe_file string /hd-media/recipe
@@ -129,91 +222,133 @@ d-i partman/default_filesystem string ext3
 #                      method{ swap } format{ }                \
 #              .
 
-#The preseed line that "selects finish" needs to be in a certain order in your preseed, the example-preseed does not follow this.
-#http://ubuntuforums.org/archive/index.php/t-1504045.html
+# The full recipe format is documented in the file partman-auto-recipe.txt
+# included in the 'debian-installer' package or available from D-I source
+# repository. This also documents how to specify settings such as file
+# system labels, volume group names and which physical devices to include
+# in a volume group.
 
 # This makes partman automatically partition without confirmation, provided
 # that you told it what to do using one of the methods above.
-d-i partman/confirm_write_new_label boolean true
+d-i partman-partitioning/confirm_write_new_label boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
+
+## Partitioning using RAID
+# The method should be set to "raid".
+#d-i partman-auto/method string raid
+# Specify the disks to be partitioned. They will all get the same layout,
+# so this will only work if the disks are the same size.
+#d-i partman-auto/disk string /dev/sda /dev/sdb
+
+# Next you need to specify the physical partitions that will be used. 
+#d-i partman-auto/expert_recipe string \
+#      multiraid ::                                         \
+#              1000 5000 4000 raid                          \
+#                      $primary{ } method{ raid }           \
+#              .                                            \
+#              64 512 300% raid                             \
+#                      method{ raid }                       \
+#              .                                            \
+#              500 10000 1000000000 raid                    \
+#                      method{ raid }                       \
+#              .
+
+# Last you need to specify how the previously defined partitions will be
+# used in the RAID setup. Remember to use the correct partition numbers
+# for logical partitions. RAID levels 0, 1, 5, 6 and 10 are supported;
+# devices are separated using "#".
+# Parameters are:
+# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
+#          <devices> <sparedevices>
+
+#d-i partman-auto-raid/recipe string \
+#    1 2 0 ext3 /                    \
+#          /dev/sda1#/dev/sdb1       \
+#    .                               \
+#    1 2 0 swap -                    \
+#          /dev/sda5#/dev/sdb5       \
+#    .                               \
+#    0 2 0 ext3 /home                \
+#          /dev/sda6#/dev/sdb6       \
+#    .
+
+# For additional information see the file partman-auto-raid-recipe.txt
+# included in the 'debian-installer' package or available from D-I source
+# repository.
+
+# This makes partman automatically partition without confirmation.
+d-i partman-md/confirm boolean true
+d-i partman-partitioning/confirm_write_new_label boolean true
+d-i partman/choose_partition select finish
 d-i partman/confirm boolean true
 d-i partman/confirm_nooverwrite boolean true
 
+## Controlling how partitions are mounted
+# The default is to mount by UUID, but you can also choose "traditional" to
+# use traditional device names, or "label" to try filesystem labels before
+# falling back to UUIDs.
+#d-i partman/mount_style select uuid
 
 ### Base system installation
-# Select the initramfs generator used to generate the initrd for 2.6 kernels.
-#d-i base-installer/kernel/linux/initramfs-generators string yaird
+# Configure APT to not install recommended packages by default. Use of this
+# option can result in an incomplete system and should only be used by very
+# experienced users.
+# FF: controlled server environment with minimal dependencies
+d-i base-installer/install-recommends boolean false
 
 # The kernel image (meta) package to be installed; "none" can be used if no
 # kernel is to be installed.
-#d-i base-installer/kernel/image string linux-image-2.6-486
-
-### Account setup
-# Skip creation of a root account (normal user account will be able to
-# use sudo).
-#d-i passwd/root-login boolean false
-# Alternatively, to skip creation of a normal user account.
-#d-i passwd/make-user boolean false
-
-# Root password, either in clear text
-d-i passwd/root-password password vagrant
-d-i passwd/root-password-again password vagrant
-# or encrypted using an MD5 hash.
-#d-i passwd/root-password-crypted password [MD5 hash]
-
-# To create a normal user account.
-d-i passwd/make-user boolean false
-#d-i passwd/user-fullname string Vagrant User
-#d-i passwd/username string vagrant
-# Normal user's password, either in clear text
-#d-i passwd/user-password password vagrant
-#d-i passwd/user-password-again password vagrant
-# or encrypted using an MD5 hash.
-#d-i passwd/user-password-crypted password [MD5 hash]
-# Create the first user with the specified UID instead of the default.
-#d-i passwd/user-uid string 1010
-d-i user-setup/encrypt-home boolean false
-d-i user-setup/allow-password-weak boolean true
-
-# The user account will be added to some standard initial groups. To
-# override that, use this.
-d-i passwd/user-default-groups string audio cdrom video admin
+#d-i base-installer/kernel/image string linux-image-586
 
 ### Apt setup
 # You can choose to install non-free and contrib software.
 #d-i apt-setup/non-free boolean true
-#d-i apt-setup/contrib boolean true
+# FF: for virtualbox-guest-dkms
+d-i apt-setup/contrib boolean true
 # Uncomment this if you don't want to use a network mirror.
 #d-i apt-setup/use_mirror boolean false
 # Select which update services to use; define the mirrors to be used.
 # Values shown below are the normal defaults.
-#d-i apt-setup/services-select multiselect security, volatile
+#d-i apt-setup/services-select multiselect security, updates
 #d-i apt-setup/security_host string security.debian.org
-#d-i apt-setup/volatile_host string volatile.debian.org
 
+# Additional repositories, local[0-9] available
+#d-i apt-setup/local0/repository string \
+#       http://local.server/debian stable main
+#d-i apt-setup/local0/comment string local server
+# Enable deb-src lines
+#d-i apt-setup/local0/source boolean true
+# URL to the public key of the local repository; you must provide a key or
+# apt will complain about the unauthenticated repository and so the
+# sources.list line will be left commented out
+#d-i apt-setup/local0/key string http://local.server/key
 
 # By default the installer requires that repositories be authenticated
 # using a known gpg key. This setting can be used to disable that
 # authentication. Warning: Insecure, not recommended.
-#d-i debian-installer/allow_unauthenticated string true
+#d-i debian-installer/allow_unauthenticated boolean true
 
 ### Package selection
+# FF: base install
+#tasksel tasksel/first multiselect standard, web-server, kde-desktop
 tasksel tasksel/first multiselect standard
-# If the desktop task is selected, install the kde and xfce desktops
-# instead of the default gnome desktop.
-#tasksel tasksel/desktop multiselect kde, xfce
 
 # Individual additional packages to install
+# FF: ?
+#d-i pkgsel/include string openssh-server build-essential
 d-i pkgsel/include string openssh-server ntp acpid
 
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade
-#d-i pkgsel/upgrade select safe-upgrade
+#d-i pkgsel/upgrade select none
 
 # Some versions of the installer can report back on what software you have
 # installed, and what software you use. The default is not to report back,
 # but sending reports helps the project determine what software is most
 # popular and include it on CDs.
-popularity-contest popularity-contest/participate boolean false
+#popularity-contest popularity-contest/participate boolean false
 
 ### Boot loader installation
 # Grub is the default boot loader (for x86). If you want lilo installed
@@ -223,13 +358,50 @@ popularity-contest popularity-contest/participate boolean false
 # too:
 #d-i lilo-installer/skip boolean true
 
+
 # This is fairly safe to set, it makes grub install automatically to the MBR
 # 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)
+# To install to a particular device:
+# FF: need to be set explicitely otherwise D-I 8 asks
+d-i grub-installer/bootdev  string /dev/sda
+
+# 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]
+
+# Use the following option to add additional boot parameters for the
+# installed system (if supported by the bootloader installer).
+# Note: options passed to the installer will be added automatically.
+#d-i debian-installer/add-kernel-opts string nousb
+
+### 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
@@ -245,9 +417,6 @@ d-i finish-install/reboot_in_progress note
 #   debconf-get-selections --installer > file
 #   debconf-get-selections >> file
 
-# Controlled server environment with minimal dependencies:
-d-i base-installer/install-recommends false
-
 
 #### Advanced options
 ### Running custom commands during the installation
@@ -260,15 +429,27 @@ d-i base-installer/install-recommends false
 
 # 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 anna-install some-udeb
+# This command is run immediately before the partitioner starts. It may be
+# useful to apply dynamic partitioner preseeding that depends on the state
+# of the disks (which may not be visible when preseed/early_command runs).
+#d-i partman/early_command \
+#       string debconf-set partman-auto/disk "$(list-devices disk | head -n1)"
 # 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.
+#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh
+
+# FF: cf. (distro-independently) scripts/vagrant.sh:
+# 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/late_command string \
 #  echo %vagrant ALL=NOPASSWD:ALL > /target/etc/sudoers.d/vagrant; \
 #  in-target chmod 0440 /etc/sudoers.d/vagrant
+
+# FF: do allow Vagrant password-based auth for the post-install (geez..)
+d-i preseed/late_command string \
+  sed -i -e 's/PermitRootLogin.*/PermitRootLogin yes/' /target/etc/ssh/sshd_config
diff --git a/vm/packer/scripts/base-debian.sh b/vm/packer/scripts/base-debian.sh
index fa4a862..913d320 100755
--- a/vm/packer/scripts/base-debian.sh
+++ b/vm/packer/scripts/base-debian.sh
@@ -2,7 +2,7 @@
 apt-get -y --force-yes update
 #apt-get -y --force-yes install linux-headers-$(uname -r) build-essential
 #apt-get -y --force-yes install zlib1g-dev libssl-dev libreadline-gplv2-dev
-apt-get -y --force-yes install wget curl unzip sudo gpm bzip2 rsync emacs23-nox php-elisp vim
+apt-get -y --force-yes install wget curl unzip sudo gpm bzip2 rsync emacs-nox php-elisp vim
 
 # Tweak sshd to prevent DNS resolution (speed up logins)
 echo 'UseDNS no' >> /etc/ssh/sshd_config
diff --git a/vm/packer/scripts/fusionforge-source.sh b/vm/packer/scripts/fusionforge-source.sh
index cbc6594..f5ecf0a 100644
--- a/vm/packer/scripts/fusionforge-source.sh
+++ b/vm/packer/scripts/fusionforge-source.sh
@@ -13,21 +13,13 @@ EOF
 # Install sources
 if [ -e /etc/debian_version ]; then
     apt-get -y --force-yes install git
-    repo='git://fusionforge.org/deb-packaging/deb-packaging.git -b debian/5.3'
 else
     echo "TODO: instructions for CentOS" >> /etc/issue
     yum -y install git
-    repo='git://fusionforge.org/fusionforge/fusionforge.git -b Branch_5_3'
 fi
 
 cd /usr/src/
-git clone $repo fusionforge/
-
-if [ -e /etc/debian_version ]; then
-    cd fusionforge/
-    git remote add upstream git://scm.fusionforge.org/fusionforge/fusionforge.git
-    git fetch upstream
-fi
+git clone git://fusionforge.org/fusionforge/fusionforge.git -b 6.0 fusionforge/
 
 git config --global color.diff auto
 git config --global color.status auto
diff --git a/vm/packer/scripts/vagrant.sh b/vm/packer/scripts/vagrant.sh
index 2334993..6638a68 100755
--- a/vm/packer/scripts/vagrant.sh
+++ b/vm/packer/scripts/vagrant.sh
@@ -10,11 +10,11 @@ chmod 0440 /etc/sudoers.d/vagrant
 # Installing vagrant keys
 # Cf. http://docs.vagrantup.com/v2/boxes/base.html
 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
+wget 'https://raw.githubusercontent.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
 
 # Install a copy for root, so we can 'vagrant ssh -- -l root'
 mkdir -pm 700 /root/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /root/.ssh/authorized_keys
+wget 'https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /root/.ssh/authorized_keys
 chmod 0600 /root/.ssh/authorized_keys

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

Summary of changes:
 vm/packer/fusionforge-dev-debian.json   |   14 +-
 vm/packer/http/preseed.cfg              |  327 ++++++++++++++++++++++++-------
 vm/packer/scripts/base-debian.sh        |    2 +-
 vm/packer/scripts/fusionforge-source.sh |   10 +-
 vm/packer/scripts/vagrant.sh            |    4 +-
 5 files changed, 265 insertions(+), 92 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list