From 5c82e5813a0a70dc72a08c2e6aab828089898f3c Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Wed, 26 Nov 2014 00:47:41 -0500 Subject: [PATCH 1/5] Update to OpenSuSE 13.2. --- .../autoinst.xml | 73 ++++++++----------- ...-x86_64.json => opensuse-13.2-x86_64.json} | 39 +++++----- packer/scripts/opensuse/cleanup.sh | 6 +- packer/scripts/opensuse/remove-dvd-source.sh | 13 ++-- packer/scripts/opensuse/services.sh | 5 -- 5 files changed, 57 insertions(+), 79 deletions(-) rename packer/http/{opensuse-13.1 => opensuse-13.2}/autoinst.xml (78%) rename packer/{opensuse-13.1-x86_64.json => opensuse-13.2-x86_64.json} (77%) delete mode 100644 packer/scripts/opensuse/services.sh diff --git a/packer/http/opensuse-13.1/autoinst.xml b/packer/http/opensuse-13.2/autoinst.xml similarity index 78% rename from packer/http/opensuse-13.1/autoinst.xml rename to packer/http/opensuse-13.2/autoinst.xml index 27243fe0a..2c1639a33 100644 --- a/packer/http/opensuse-13.1/autoinst.xml +++ b/packer/http/opensuse-13.2/autoinst.xml @@ -40,57 +40,59 @@ UTC Etc/UTC - + /dev/sda true true false - ext4 - 131 + swap true defaults false - /boot + swap device - 131 + 130 1 + false 512M true false - ext4 - 131 + btrfs true - defaults false / device 131 2 + false max - - - true - false - swap - 130 - true - defaults - false - swap - device - 130 - 3 - false - 512M + + boot/grub2/i386-pc + boot/grub2/x86_64-efi + home + opt + srv + tmp + usr/local + var/crash + var/lib/mailman + var/lib/named + var/lib/pgsql + var/log + var/opt + var/spool + var/tmp + + CT_DISK all @@ -106,8 +108,8 @@ true true - local - linux + vagrantup.com + opensuse-13.2-x64 @@ -124,8 +126,8 @@ - false - false + true + true @@ -139,32 +141,23 @@ kernel-default-devel gcc make - less - vim sudo - screen yast2 yast2-firstboot zypper yast2-trans-en_US wget curl - iproute2 - ifplugd - kexec-tools - libdaemon0 - libnl1 - libxslt-tools - cryptsetup-mkinitrd grub2-branding-openSUSE - rsyslog sw_management yast2_install_wf - base + minimal_base + bash-completion + telnet virtualbox-guest-kmp-default virtualbox-guest-tools @@ -187,8 +180,6 @@ shell diff --git a/packer/opensuse-13.1-x86_64.json b/packer/opensuse-13.2-x86_64.json similarity index 77% rename from packer/opensuse-13.1-x86_64.json rename to packer/opensuse-13.2-x86_64.json index bb2b4faec..09421722c 100644 --- a/packer/opensuse-13.1-x86_64.json +++ b/packer/opensuse-13.2-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "", "linux netsetup=dhcp install=cd:/", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml", " textmode=1", "" ], @@ -13,10 +13,10 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE_64", "http_directory": "http", - "iso_checksum": "1096c9c67fc8a67a94a32d04a15e909d", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-x86_64.iso", - "output_directory": "packer-opensuse-13.1-x86_64-virtualbox", + "iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-x86_64.iso", + "output_directory": "packer-opensuse-13.2-x86_64-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,13 +38,13 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-opensuse-13.1-x86_64" + "vm_name": "packer-opensuse-13.2-x86_64" }, { "boot_command": [ "", "linux netsetup=dhcp install=cd:/", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml", " textmode=1", "" ], @@ -52,10 +52,10 @@ "disk_size": 20480, "guest_os_type": "opensuse-64", "http_directory": "http", - "iso_checksum": "1096c9c67fc8a67a94a32d04a15e909d", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-x86_64.iso", - "output_directory": "packer-opensuse-13.1-x86_64-vmware", + "iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-x86_64.iso", + "output_directory": "packer-opensuse-13.2-x86_64-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", "ssh_password": "vagrant", "ssh_port": 22, @@ -63,7 +63,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-opensuse-13.1-x86_64", + "vm_name": "packer-opensuse-13.2-x86_64", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -74,7 +74,7 @@ "boot_command": [ "", "linux netsetup=dhcp install=cd:/", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml", " textmode=1", "" ], @@ -82,10 +82,10 @@ "disk_size": 20480, "guest_os_type": "opensuse", "http_directory": "http", - "iso_checksum": "1096c9c67fc8a67a94a32d04a15e909d", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-x86_64.iso", - "output_directory": "packer-opensuse-13.1-x86_64-parallels", + "iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-x86_64.iso", + "output_directory": "packer-opensuse-13.2-x86_64-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -108,12 +108,12 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-opensuse-13.1-x86_64" + "vm_name": "packer-opensuse-13.2-x86_64" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_opensuse-13.1-x86_64_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_opensuse-13.2-x86_64_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], @@ -128,7 +128,6 @@ "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", - "scripts/opensuse/services.sh", "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", diff --git a/packer/scripts/opensuse/cleanup.sh b/packer/scripts/opensuse/cleanup.sh index 2e466416d..60d03873d 100644 --- a/packer/scripts/opensuse/cleanup.sh +++ b/packer/scripts/opensuse/cleanup.sh @@ -1,7 +1,3 @@ #!/bin/bash -eux # These were only needed for building VMware/Virtualbox extensions: -zypper -n rm -u binutils gcc make site-config patterns-openSUSE-yast2_install_wf -# backlist i2c_piix4 - VirtualBox has no smbus -echo "blacklist i2c_piix4" > /etc/modprobe.d/100-blacklist-i2c_piix4.conf -# remove all kernels except current running -rpm -qa | grep kernel-default | grep -v `uname -r | awk -F"-" '{print $1"-"$2}'` | xargs rpm -ehv +zypper -n rm -u binutils gcc make site-config patterns-openSUSE-yast2_install_wf perl diff --git a/packer/scripts/opensuse/remove-dvd-source.sh b/packer/scripts/opensuse/remove-dvd-source.sh index adbf70616..f851a3e14 100644 --- a/packer/scripts/opensuse/remove-dvd-source.sh +++ b/packer/scripts/opensuse/remove-dvd-source.sh @@ -1,11 +1,8 @@ #!/bin/sh -eux -zypper removerepo "openSUSE-13.1-1.10" -rpm --import http://download.opensuse.org/distribution/13.1/repo/oss/gpg-pubkey-3dbdc284-4be1884d.asc -rpm --import http://download.opensuse.org/distribution/13.1/repo/oss/gpg-pubkey-307e3d54-4be01a65.asc -zypper ar http://download.opensuse.org/distribution/13.1/repo/oss/ opensuse-13.1-oss -zypper ar http://download.opensuse.org/distribution/13.1/repo/non-oss/ opensuse-13.1-non-oss -zypper ar http://download.opensuse.org/update/13.1/ opensuse-13.1-update -zypper ar http://download.opensuse.org/update/13.1-non-oss/ opensuse-13.1-update-non-oss +zypper removerepo "openSUSE-13.2-0" +zypper ar http://download.opensuse.org/distribution/13.2/repo/oss/ openSUSE-13.2-Oss +zypper ar http://download.opensuse.org/distribution/13.2/repo/non-oss/ openSUSE-13.2-Non-Oss +zypper ar http://download.opensuse.org/update/13.2/ openSUSE-13.2-Update +zypper ar http://download.opensuse.org/update/13.2-non-oss/ openSUSE-13.2-Update-Non-Oss zypper refresh -zypper update -y diff --git a/packer/scripts/opensuse/services.sh b/packer/scripts/opensuse/services.sh deleted file mode 100644 index 51891328b..000000000 --- a/packer/scripts/opensuse/services.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -eux - -systemctl enable sshd -systemctl enable network -systemctl enable rsyslog \ No newline at end of file From 369ffe039a6ba938b030070877130f8b94f733a5 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Wed, 26 Nov 2014 18:46:07 -0500 Subject: [PATCH 2/5] Added i386 support --- ...13.1-i386.json => opensuse-13.2-i386.json} | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) rename packer/{opensuse-13.1-i386.json => opensuse-13.2-i386.json} (77%) diff --git a/packer/opensuse-13.1-i386.json b/packer/opensuse-13.2-i386.json similarity index 77% rename from packer/opensuse-13.1-i386.json rename to packer/opensuse-13.2-i386.json index f0a72f200..c31586bf4 100644 --- a/packer/opensuse-13.1-i386.json +++ b/packer/opensuse-13.2-i386.json @@ -4,7 +4,7 @@ "boot_command": [ "", "linux netsetup=dhcp install=cd:/", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml", " textmode=1", "" ], @@ -13,10 +13,10 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "guest_os_type": "OpenSUSE", "http_directory": "http", - "iso_checksum": "1bd6223430910f6d5a168d4e19171462", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-i586.iso", - "output_directory": "packer-opensuse-13.1-i386-virtualbox", + "iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-i586.iso", + "output_directory": "packer-opensuse-13.2-i386-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -38,13 +38,13 @@ ] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-opensuse-13.1-i386" + "vm_name": "packer-opensuse-13.2-i386" }, { "boot_command": [ "", "linux netsetup=dhcp install=cd:/", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml", " textmode=1", "" ], @@ -52,10 +52,10 @@ "disk_size": 20480, "guest_os_type": "opensuse", "http_directory": "http", - "iso_checksum": "1bd6223430910f6d5a168d4e19171462", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-i586.iso", - "output_directory": "packer-opensuse-13.1-i386-vmware", + "iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-i586.iso", + "output_directory": "packer-opensuse-13.2-i386-vmware", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1", "ssh_password": "vagrant", "ssh_port": 22, @@ -63,7 +63,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-opensuse-13.1-i386", + "vm_name": "packer-opensuse-13.2-i386", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "480", @@ -74,7 +74,7 @@ "boot_command": [ "", "linux netsetup=dhcp install=cd:/", - " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.1/autoinst.xml", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml", " textmode=1", "" ], @@ -82,10 +82,10 @@ "disk_size": 20480, "guest_os_type": "opensuse", "http_directory": "http", - "iso_checksum": "1bd6223430910f6d5a168d4e19171462", - "iso_checksum_type": "md5", - "iso_url": "{{user `mirror`}}/13.1/iso/openSUSE-13.1-DVD-i586.iso", - "output_directory": "packer-opensuse-13.1-i386-parallels", + "iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-i586.iso", + "output_directory": "packer-opensuse-13.2-i386-parallels", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -108,12 +108,12 @@ ] ], "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-opensuse-13.1-i386" + "vm_name": "packer-opensuse-13.2-i386" } ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_opensuse-13.1-i386_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_opensuse-13.2-i386_chef-{{user `chef_version`}}.box", "type": "vagrant" } ], @@ -128,7 +128,6 @@ "scripts/common/vagrant.sh", "scripts/common/vmtools.sh", "scripts/common/chef.sh", - "scripts/opensuse/services.sh", "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", From cc3d5de211581a8f6daf456219e75c6e3afcc1d9 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Wed, 26 Nov 2014 22:21:43 -0500 Subject: [PATCH 3/5] Use new-style services management. Slim down the list of packages removed. --- packer/http/opensuse-13.2/autoinst.xml | 33 ++++++++------------------ packer/scripts/opensuse/cleanup.sh | 2 +- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/packer/http/opensuse-13.2/autoinst.xml b/packer/http/opensuse-13.2/autoinst.xml index 2c1639a33..eb1211d7d 100644 --- a/packer/http/opensuse-13.2/autoinst.xml +++ b/packer/http/opensuse-13.2/autoinst.xml @@ -142,6 +142,7 @@ gcc make sudo + rsyslog yast2 yast2-firstboot zypper @@ -162,29 +163,16 @@ virtualbox-guest-tools - - - - - sshd - 3 5 - + + graphical + + + + rsyslog + sshd + - - - - - - - - + 100 @@ -192,7 +180,6 @@ systemctl restart sshd - 100 diff --git a/packer/scripts/opensuse/cleanup.sh b/packer/scripts/opensuse/cleanup.sh index 60d03873d..1932d3277 100644 --- a/packer/scripts/opensuse/cleanup.sh +++ b/packer/scripts/opensuse/cleanup.sh @@ -1,3 +1,3 @@ #!/bin/bash -eux # These were only needed for building VMware/Virtualbox extensions: -zypper -n rm -u binutils gcc make site-config patterns-openSUSE-yast2_install_wf perl +zypper -n rm -u binutils gcc make perl ruby From 0cd8aa496e84f665d751785eebcbb2bcc1f01522 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Wed, 26 Nov 2014 22:29:50 -0500 Subject: [PATCH 4/5] Cleanup moar things --- packer/http/opensuse-13.2/autoinst.xml | 7 +++++-- packer/scripts/opensuse/cleanup.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packer/http/opensuse-13.2/autoinst.xml b/packer/http/opensuse-13.2/autoinst.xml index eb1211d7d..cdd8c341c 100644 --- a/packer/http/opensuse-13.2/autoinst.xml +++ b/packer/http/opensuse-13.2/autoinst.xml @@ -142,7 +142,6 @@ gcc make sudo - rsyslog yast2 yast2-firstboot zypper @@ -157,10 +156,15 @@ minimal_base + augeas-lenses bash-completion + bash-doc + exim + kexec-tools telnet virtualbox-guest-kmp-default virtualbox-guest-tools + wireless-regdb @@ -168,7 +172,6 @@ - rsyslog sshd diff --git a/packer/scripts/opensuse/cleanup.sh b/packer/scripts/opensuse/cleanup.sh index 1932d3277..f83c0b645 100644 --- a/packer/scripts/opensuse/cleanup.sh +++ b/packer/scripts/opensuse/cleanup.sh @@ -1,3 +1,3 @@ #!/bin/bash -eux # These were only needed for building VMware/Virtualbox extensions: -zypper -n rm -u binutils gcc make perl ruby +zypper -n rm -u binutils gcc make perl ruby kernel-default-devel kernel-devel From ba27b890fed84227b20e9e7b9bb4c6bc19f0c354 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Wed, 26 Nov 2014 22:36:17 -0500 Subject: [PATCH 5/5] Remove conflicts with minimal_base --- packer/http/opensuse-13.2/autoinst.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packer/http/opensuse-13.2/autoinst.xml b/packer/http/opensuse-13.2/autoinst.xml index cdd8c341c..1f16ef216 100644 --- a/packer/http/opensuse-13.2/autoinst.xml +++ b/packer/http/opensuse-13.2/autoinst.xml @@ -156,15 +156,10 @@ minimal_base - augeas-lenses bash-completion - bash-doc - exim - kexec-tools telnet virtualbox-guest-kmp-default virtualbox-guest-tools - wireless-regdb