Merge pull request #29 from Wenzel/ubuntu_desktop

Ubuntu desktop

Author: Wenzel

packer-templates/build_ubuntu_series.py

@@ -6,7 +6,7 @@
 Options:
     -h --help                       Display this message
     -d --debug                      Enable debug output
-    -f --flavor=FLAVOR              Specify Ubuntu flavor (server, desktop...) [Default: server]
+    -f --flavor=FLAVOR              Specify Ubuntu flavor (server OR desktop) [Default: server]
     -a --arch=ARCH                  Specify architecture (i386, amd64...) [Default: amd64]
     -c --cpus=CPUS                  Specify the number of cpus to use for QEMU [Default: 2]
 """
@@ -127,15 +127,19 @@ def main(args):
         logging.info('Building Ubuntu %s', version)
         logging.debug('URL : %s', dir_url)
         with NamedTemporaryFile(mode='w') as tmp_varfile:
+            flavor_real = flavor
+            if flavor == 'desktop':
+                # we have to use the alternate iso
+                flavor_real = 'alternate'
             varfile = {
                 'vm_name': 'ubuntu-{}-{}-{}.qcow2'.format(version, flavor, arch),
                 'memory': '512',
                 'cpus': str(cpus),
                 'disk_size': '65536',
                 'iso_checksum_url': '{}/SHA1SUMS'.format(dir_url),
                 'iso_checksum_type': 'sha1',
-                'iso_url': '{}/ubuntu-{}-{}-{}.iso'.format(dir_url, version, flavor, arch),
-                'preseed': 'ubuntu/preseed.cfg',
+                'iso_url': '{}/ubuntu-{}-{}-{}.iso'.format(dir_url, version, flavor_real, arch),
+                'preseed': 'ubuntu/preseed-{}.cfg'.format(flavor),
                 'version': '1'
             }
             json.dump(varfile, tmp_varfile)

packer-templates/http/ubuntu/preseed-desktop.cfg

@@ -0,0 +1,35 @@
+d-i debian-installer/locale string en_US
+d-i time/zone string UTC
+
+d-i keyboard-configuration/xkb-keymap select us
+
+d-i partman-auto/method string regular
+d-i partman-auto/choose_recipe select atomic
+d-i partman/default_filesystem string ext4
+d-i partman-partitioning/confirm_write_new_label boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
+
+d-i base-installer/excludes string laptop-detect
+
+d-i passwd/root-password-again password vagrant
+d-i passwd/root-password password vagrant
+d-i passwd/user-fullname string vagrant
+d-i passwd/username string vagrant
+d-i passwd/user-password password vagrant
+d-i passwd/user-password-again password vagrant
+d-i user-setup/allow-password-weak boolean true
+
+d-i pkgsel/include string curl openssh-server sudo
+d-i pkgsel/language-packs multiselect
+tasksel tasksel/first multiselect ubuntu-desktop
+
+d-i finish-install/reboot_in_progress note
+
+d-i preseed/late_command string                                                   \
+        echo 'Defaults:vagrant !requiretty' > /target/etc/sudoers.d/vagrant;      \
+        echo 'vagrant ALL=(ALL) NOPASSWD: ALL' >> /target/etc/sudoers.d/vagrant;  \
+        chmod 440 /target/etc/sudoers.d/vagrant;                                  \
+        ln -sf /dev/null /target/etc/systemd/network/99-default.link;             \
+        in-target update-initramfs -u

packer-templates/http/ubuntu/preseed.cfg …templates/http/ubuntu/preseed-server.cfgpacker-templates/http/ubuntu/preseed.cfg renamed to packer-templates/http/ubuntu/preseed-server.cfg packer-templates/http/ubuntu/preseed.cfg renamed to packer-templates/http/ubuntu/preseed-server.cfg

@@ -6,8 +6,9 @@
             "vm_name": "{{ user `vm_name` }}",
             "cpus": "{{ user `cpus`}}",
             "memory": "{{ user `memory` }}",
+            "boot_wait": "{{ user `boot_wait` }}",
             "boot_command": [
-                "<enter><wait>",
+                "{{ user `boot_command_prefix` }}",
                 "<f6><esc>",
                 "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
                 "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
@@ -46,6 +47,8 @@
     "variables": {
         "cpus": "1",
         "memory": "512",
+        "boot_command_prefix": "<enter><wait>",
+        "boot_wait": "5s",
         "install_vagrant_key": "true",
         "install_dev_packages": "false",
         "disk_size": "65536",