Merge pull request #6 from evaryont/master

Alpine 3.6 has pre-compiled packages for VirtualBox Guests

alpine3.6/alpine-3.6-x86_64.json

@@ -1,7 +1,7 @@
 {
   "description": "Build base Alpine Linux x86_64",
   "push": {
-    "name": "maier/alpine35",
+    "name": "maier/alpine36",
     "vcs": true
   },
   "variables": {
@@ -43,9 +43,9 @@
       "disk_size": "{{user `disk_size`}}",
       "http_directory": "http",
 
-      "iso_urls": ["isos/alpine-virt-3.6.0-x86_64.iso",
-                   "http://nl.alpinelinux.org/alpine/v3.6/releases/x86_64/alpine-virt-3.6.0-x86_64.iso"],
-      "iso_checksum": "d848fda73b8af3cc1a147320aba50e670f2eaeb1ff7fcf355eef9821f92219ca",
+      "iso_urls": ["isos/alpine-standard-3.6.2-x86_64.iso",
+                   "http://dl-cdn.alpinelinux.org/alpine/v3.6/releases/x86_64/alpine-standard-3.6.2-x86_64.iso"],
+      "iso_checksum": "ddf8b91cc0d2b1c110f26607d410e5c951eedff9c60d6eb05d220b87c1970840",
       "iso_checksum_type": "sha256",
 
       "communicator": "ssh",

alpine3.6/scripts/01alpine.sh

@@ -1,5 +1,4 @@
 set -ux
 
-# nothing special required
-
-exit 0
+# update all packages, especially the kernel.
+apk update && apk upgrade

alpine3.6/scripts/90virtualbox.sh

@@ -1,53 +1,5 @@
 set -eux
-echo "VBoxGuestAdditions currently do not build or install on Alpine Linux."
-exit 0
-#
-# #
-# # VBoxGuestAdditions fails to install.
-# #
-# # Alpine is intended to be 'minimal' so
-# # there are certain things VBGA
-# # 1. needs
-# # 2. *assumes* are available
-# # 3. or function a specific way
-# # which is, not yet, the case...
-# #
-#
-# mkdir -p /mnt/virtualbox
-# retval=$?
-# [ $retval -eq 0 ] || exit $retval
-#
-# modprobe loop
-# retval=$?
-# [ $retval -eq 0 ] || exit $retval
-#
-# LOOP=`losetup -f`
-# retval=$?
-# [ $retval -eq 0 ] || exit $retval
-#
-# losetup $LOOP /root/VBoxGuestAdditions.iso
-# retval=$?
-# [ $retval -eq 0 ] || exit $retval
-#
-# mount -t iso9660 -o ro $LOOP /mnt/virtualbox
-# retval=$?
-# [ $retval -eq 0 ] || exit $retval
-#
-# # current error 'unable to determine library path.'
-# # "ldconfig -v" does not result in a list of valid
-# # library paths (it is actually a shell script which
-# # silently ignores -v).
-# #
-# # there are other issues as well, which have been
-# # open with oracle/virtualbox for several years.
-# # without forward progress (according to search
-# # results and skimming through various discussions).
-# sh /mnt/virtualbox/VBoxLinuxAdditions.run
-# retval=$?
-# [ $retval -eq 0 ] || exit $retval
-#
-# ln -s /opt/VBoxGuestAdditions-*/lib/VBoxGuestAdditions /usr/lib/VBoxGuestAdditions
-# umount /mnt/virtualbox
-# rm -rf /root/VBoxGuestAdditions.iso
-#
-# # END
+
+echo http://dl-cdn.alpinelinux.org/alpine/v3.6/community >> /etc/apk/repositories
+apk add -U virtualbox-guest-additions virtualbox-guest-modules-hardened
+rc-update add virtualbox-guest-additions