Merge pull request #723 from rickard-von-essen/opensuse-leap-42.2

Updated to OpenSUSE Leap 42.2
chef · Nov 22, 2016 · c7f8c16 · c7f8c16
2 parents a87695f + 889d8cc
commit c7f8c16
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/http/opensuse-leap-42.1/autoinst.xml → http/opensuse-leap-42.2/autoinst.xml b/http/opensuse-leap-42.1/autoinst.xml → http/opensuse-leap-42.2/autoinst.xml
@@ -108,7 +108,7 @@
       <dhcp_hostname config:type="boolean">true</dhcp_hostname>
       <dhcp_resolv config:type="boolean">true</dhcp_resolv>
       <domain>vagrantup.com</domain>
-      <hostname>opensuse-leap-42.1-x64</hostname>
+      <hostname>opensuse-leap-42.2-x64</hostname>
     </dns>
     <interfaces config:type="list">
       <interface>

diff --git a/opensuse-leap-42.1-x86_64.json → opensuse-leap-42.2-x86_64.json b/opensuse-leap-42.1-x86_64.json → opensuse-leap-42.2-x86_64.json
@@ -4,7 +4,7 @@
       "boot_command": [
         "<esc><enter><wait>",
         "linux netsetup=dhcp install=cd:/<wait>",
-        " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>",
+        " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>",
         " textmode=1<wait>",
         "<enter><wait>"
       ],
@@ -46,7 +46,7 @@
       "boot_command": [
         "<esc><enter><wait>",
         "linux netsetup=dhcp install=cd:/<wait>",
-        " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>",
+        " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>",
         " textmode=1<wait>",
         "<enter><wait>"
       ],
@@ -77,7 +77,7 @@
       "boot_command": [
         "<esc><enter><wait>",
         "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>",
-        " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>",
+        " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>",
         " textmode=1<wait>",
         "<enter><wait>"
       ],
@@ -117,7 +117,7 @@
       "boot_command": [
         "<esc><enter><wait>",
         "linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>",
-        " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>",
+        " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>",
         " textmode=1<wait>",
         "<enter><wait>"
       ],
@@ -176,25 +176,25 @@
   ],
   "variables": {
     "arch": "64",
-    "autoinst_cfg": "opensuse-leap-42.1/autoinst.xml",
-    "box_basename": "opensuse-leap-42.1",
+    "autoinst_cfg": "opensuse-leap-42.2/autoinst.xml",
+    "box_basename": "opensuse-leap-42.2",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",
     "disk_size": "20480",
     "git_revision": "__unknown_git_revision__",
     "headless": "",
     "http_proxy": "{{env `http_proxy`}}",
     "https_proxy": "{{env `https_proxy`}}",
-    "iso_checksum": "8576e84822cdbe566bf551e28a169fc028229831eba9f07a4c1f84302c5ddb09",
+    "iso_checksum": "ba5af6b0ac4d42d801de642304eb88ca9fd65a61b6c3ff25724182494f288f00",
     "iso_checksum_type": "sha256",
-    "iso_name": "openSUSE-Leap-42.1-DVD-x86_64.iso",
+    "iso_name": "openSUSE-Leap-42.2-DVD-x86_64.iso",
     "memory": "768",
     "metadata": "floppy/dummy_metadata.json",
     "mirror": "http://suse.mobile-central.org/distribution",
-    "mirror_directory": "leap/42.1/iso",
-    "name": "opensuse-leap-42.1",
+    "mirror_directory": "leap/42.2/iso",
+    "name": "opensuse-leap-42.2",
     "no_proxy": "{{env `no_proxy`}}",
-    "template": "opensuse-leap-42.1-x86_64",
+    "template": "opensuse-leap-42.2-x86_64",
     "version": "2.0.TIMESTAMP"
   }
 }
diff --git a/scripts/opensuse/cleanup.sh b/scripts/opensuse/cleanup.sh
@@ -1,3 +1,12 @@
 #!/bin/bash -eux
 # These were only needed for building VMware/Virtualbox extensions:
-zypper -n rm -u binutils gcc make perl ruby kernel-default-devel kernel-devel
+
+version=`grep VERSION= /etc/os-release | cut -f2 -d\" | cut -f1 -d\ `
+
+if [[ $version =~ "13" ]]; then
+  zypper -n rm -u binutils gcc make perl ruby kernel-default-devel kernel-devel
+fi
+
+if [[ $version =~ "4" ]]; then
+  zypper -n rm -u gcc make kernel-default-devel kernel-devel
+fi