From 0af0d69735cb60fdc431d6ed792bc3728cd071b9 Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Sun, 16 Mar 2014 23:40:42 +0100 Subject: update debian version 7.4 --- wheezy/definition.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wheezy/definition.rb b/wheezy/definition.rb index dfd7a65..c51ce3c 100644 --- a/wheezy/definition.rb +++ b/wheezy/definition.rb @@ -3,9 +3,9 @@ Veewee::Definition.declare({ :memory_size=> '256', :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'on', :os_type_id => 'Debian_64', - :iso_file => "debian-7.0.0-amd64-netinst.iso", - :iso_src => "http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-7.0.0-amd64-netinst.iso", - :iso_md5 => "6a55096340b5b1b7d335d5b559e13ea0", + :iso_file => "debian-7.4.0-amd64-netinst.iso", + :iso_src => "http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-7.4.0-amd64-netinst.iso", + :iso_md5 => "e7e9433973f082a297793c3c5010b2c5", :iso_download_timeout => "1000", :boot_wait => "10", :boot_cmd_sequence => [ '', -- cgit v1.2.3 From 67af77bed23d23f98b3ab4fab932415c1a44f89d Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Sun, 16 Mar 2014 23:44:15 +0100 Subject: seperate virtualbox cleaning into virtualbox.sh, otherwise we have troubles with other providers --- wheezy/cleanup-virtualbox.sh | 4 ---- wheezy/virtualbox.sh | 29 ++++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 7 deletions(-) delete mode 100644 wheezy/cleanup-virtualbox.sh diff --git a/wheezy/cleanup-virtualbox.sh b/wheezy/cleanup-virtualbox.sh deleted file mode 100644 index ccc6d5a..0000000 --- a/wheezy/cleanup-virtualbox.sh +++ /dev/null @@ -1,4 +0,0 @@ -# Cleanup Virtualbox -VBOX_VERSION=$(cat .vbox_version) -VBOX_ISO=VBoxGuestAdditions_$VBOX_VERSION.iso -rm $VBOX_ISO diff --git a/wheezy/virtualbox.sh b/wheezy/virtualbox.sh index 5a91aa6..6c8ef68 100644 --- a/wheezy/virtualbox.sh +++ b/wheezy/virtualbox.sh @@ -1,15 +1,38 @@ if test -f .vbox_version ; then # The netboot installs the VirtualBox support (old) so we have to remove it - /etc/init.d/virtualbox-ose-guest-utils stop + if test -f /etc/init.d/virtualbox-ose-guest-utils ; then + /etc/init.d/virtualbox-ose-guest-utils stop + fi + rmmod vboxguest aptitude -y purge virtualbox-ose-guest-x11 virtualbox-ose-guest-dkms virtualbox-ose-guest-utils + # Install dkms for dynamic compiles + + apt-get install -y dkms + + + # If libdbus is not installed, virtualbox will not autostart + apt-get -y install --no-install-recommends libdbus-1-3 + # Install the VirtualBox guest additions - VBOX_VERSION=$(cat /home/vagrant/.vbox_version) + VBOX_VERSION=$(cat .vbox_version) + VBOX_ISO=VBoxGuestAdditions_$VBOX_VERSION.iso cd /tmp wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso - VBOX_ISO=VBoxGuestAdditions_$VBOX_VERSION.iso mount -o loop $VBOX_ISO /mnt yes|sh /mnt/VBoxLinuxAdditions.run umount /mnt + + # Start the newly build driver + /etc/init.d/vboxadd start + + # Make a temporary mount point + mkdir /tmp/veewee-validation + + # Test mount the veewee-validation + mount -t vboxsf veewee-validation /tmp/veewee-validation + + rm /tmp/$VBOX_ISO + fi -- cgit v1.2.3 From d420c3abd5259ccf6ef9acb3011587b15ce3ddb9 Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Mon, 17 Mar 2014 00:11:44 +0100 Subject: don't call cleanup-virtualbox, that's removed --- wheezy/definition.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/wheezy/definition.rb b/wheezy/definition.rb index c51ce3c..b016565 100644 --- a/wheezy/definition.rb +++ b/wheezy/definition.rb @@ -37,7 +37,6 @@ Veewee::Definition.declare({ "base.sh", "vagrant.sh", "virtualbox.sh", - "cleanup-virtualbox.sh", "cleanup.sh", "zerodisk.sh" ], -- cgit v1.2.3 From eb5882f20c50492c4a9119d9fb00e9c0e2f5a1e4 Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Mon, 17 Mar 2014 01:00:51 +0100 Subject: Took out disk specification because with libvirt and virtual box you would get /dev/vda and /dev/sda. --- wheezy/preseed.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wheezy/preseed.cfg b/wheezy/preseed.cfg index 969b00d..0738c80 100644 --- a/wheezy/preseed.cfg +++ b/wheezy/preseed.cfg @@ -96,7 +96,11 @@ d-i clock-setup/ntp boolean true # be given in traditional non-devfs format. # Note: A disk must be specified, unless the system has only one disk. # For example, to use the first SCSI/SATA hard disk: -d-i partman-auto/disk string /dev/sda + +# because with kvm/libvirt, this would end up being /dev/vda +# d-i partman-auto/disk string /dev/sda +#d-i partman-auto/disk string /dev/vda + # In addition, you'll need to specify the method to use. # The presently available methods are: "regular", "lvm" and "crypto" d-i partman-auto/method string lvm -- cgit v1.2.3 From a056852708ff1d3bcc84ae207c9c3fbbd97e1ba0 Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Tue, 18 Mar 2014 11:37:13 +0100 Subject: there is lib/veewee/provider/virtualbox/box/helper/guest_additions.rb that takes care of downloading vbox guest utils when needed --- wheezy/virtualbox.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/wheezy/virtualbox.sh b/wheezy/virtualbox.sh index 6c8ef68..818ca30 100644 --- a/wheezy/virtualbox.sh +++ b/wheezy/virtualbox.sh @@ -10,7 +10,6 @@ if test -f .vbox_version ; then # Install dkms for dynamic compiles apt-get install -y dkms - # If libdbus is not installed, virtualbox will not autostart apt-get -y install --no-install-recommends libdbus-1-3 @@ -18,8 +17,6 @@ if test -f .vbox_version ; then # Install the VirtualBox guest additions VBOX_VERSION=$(cat .vbox_version) VBOX_ISO=VBoxGuestAdditions_$VBOX_VERSION.iso - cd /tmp - wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso mount -o loop $VBOX_ISO /mnt yes|sh /mnt/VBoxLinuxAdditions.run umount /mnt @@ -33,6 +30,6 @@ if test -f .vbox_version ; then # Test mount the veewee-validation mount -t vboxsf veewee-validation /tmp/veewee-validation - rm /tmp/$VBOX_ISO + rm $VBOX_ISO fi -- cgit v1.2.3