Merge branch 'current' of github.com:vyos/vyos-build into current

2 files changed, 33 insertions, 1 deletions

diff --git a/scripts/build-hyperv-image b/scripts/build-hyperv-image
new file mode 100755
index 00000000..40c0c828
--- /dev/null
+++ b/scripts/build-hyperv-image
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# Copyright (C) 2016 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File: build-hyperv-image
+# Purpose:
+#   Build VyOS image for Hyper-V.
+
+export PACKER_BUILD_DIR=packer_build
+
+DST_DIR=${PACKER_BUILD_DIR}/hyperv
+mkdir -p ${DST_DIR}
+
+# Convert raw image to VHD
+source_image=${PACKER_BUILD_DIR}/qemu/vyos_qemu_image.img
+vhd=${DST_DIR}/vyos_hyperv_image.vhd
+qemu-img convert -f raw ${source_image} -O vpc ${vhd}
+if [ "$?" = "0" ]; then
+  echo "Hyper-V image successfully created to ./${vhd}"
+fi
diff --git a/scripts/live-build-config b/scripts/live-build-config
index 6ac49bd7..cb9e84dc 100755
--- a/scripts/live-build-config
+++ b/scripts/live-build-config
@@ -36,7 +36,7 @@ lb config noauto \
         --architectures {{architecture}} \
         --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay" \
         --linux-flavours {{architecture}}-vyos \
-        --linux-packages linux-image-4.4.5 \
+        --linux-packages linux-image-4.4.15 \
         --bootloader syslinux \
         --binary-images iso-hybrid \
         --debian-installer false \