summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--http/ubuntu-16.04/preseed.cfg34
-rw-r--r--ubuntu-16.04-amd64.json13
2 files changed, 26 insertions, 21 deletions
diff --git a/http/ubuntu-16.04/preseed.cfg b/http/ubuntu-16.04/preseed.cfg
index 598790b..55dab8d 100644
--- a/http/ubuntu-16.04/preseed.cfg
+++ b/http/ubuntu-16.04/preseed.cfg
@@ -1,6 +1,5 @@
d-i debian-installer/locale string en_US
d-i time/zone string UTC
-
d-i keyboard-configuration/xkb-keymap select de
d-i partman-basicfilesystems/choose_label string gpt
@@ -12,21 +11,21 @@ d-i partman/choose_label string gpt
d-i partman/default_label string gpt
d-i partman-auto/method string regular
d-i partman-auto/expert_recipe string \
- scheme :: \
- 32 32 32 free \
- $gptonly{ } \
- $primary{ } \
- $bios_boot{ } \
- method{ biosgrub } . \
- 1 0 -1 ext4 \
- $gptonly{ } \
- $primary{ } \
- method{ format } \
- format{ } \
- use_filesystem{ } \
- filesystem{ ext4 } \
- label{ SLX_SYS } \
- mountpoint{ / } .
+ scheme :: \
+ 32 32 32 free \
+ $gptonly{ } \
+ $primary{ } \
+ $bios_boot{ } \
+ method{ biosgrub } . \
+ 1 0 -1 ext4 \
+ $gptonly{ } \
+ $primary{ } \
+ method{ format } \
+ format{ } \
+ use_filesystem{ } \
+ filesystem{ xfs } \
+ label{ SLX_SYS } \
+ mountpoint{ / } .
d-i partman-partitioning/confirm_write_new_label boolean true
d-i partman/choose_partition select finish
d-i partman/confirm boolean true
@@ -35,10 +34,9 @@ d-i partman/confirm_nooverwrite boolean true
d-i base-installer/excludes string laptop-detect
d-i passwd/make-user boolean false
d-i passwd/root-login boolean true
-d-i passwd/root-password-crypted password $6$6yzbOJJy5auuBh9$XUAtAt/ErLkz6.1t8J4UpyZPPUbKjGO1uATaZaxmG02IhJbOwnJMqI6MTJw.SzbBvy8THCmmoia1tVMfXhGVJ1
d-i user-setup/allow-password-weak boolean true
-d-i pkgsel/include string curl openssh-server sudo ansible
+d-i pkgsel/include string curl openssh-server ansible
d-i pkgsel/language-packs multiselect
d-i finish-install/reboot_in_progress note
diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json
index 208b088..79276fa 100644
--- a/ubuntu-16.04-amd64.json
+++ b/ubuntu-16.04-amd64.json
@@ -3,17 +3,18 @@
"iso_url": "http://releases.ubuntu.com/16.04/ubuntu-16.04.2-server-amd64.iso",
"iso_checksum": "737ae7041212c628de5751d15c3016058b0e833fdc32e7420209b76ca3d0a535",
"iso_checksum_type": "sha256",
- "vm_name": "packer-ubuntu-amd64",
+ "vm_name": "ubuntu-amd64",
"http_dir": "http",
"preseed_path": "ubuntu-16.04/preseed.cfg",
- "shutdown_command": "systemctl poweroff"
+ "shutdown_command": "systemctl poweroff",
+ "ssh_password":"{{ env `ROOTPW` }}"
},
"builders": [{
"type": "qemu",
"iso_url": "{{ user `iso_url` }}",
"iso_checksum": "{{ user `iso_checksum` }}",
"iso_checksum_type": "{{ user `iso_checksum_type` }}",
- "output_directory": "output-ubuntu-amd64-{{ build_type }}-{{ timestamp }}",
+ "output_directory": "qemu/output-ubuntu-amd64-{{ build_type }}-{{ timestamp }}",
"vm_name": "{{ user `vm_name` }}",
"disk_size": "{{ user `disk_size` }}",
"format": "qcow2",
@@ -34,6 +35,8 @@
"/install/vmlinuz ",
"initrd=/install/initrd.gz ",
"auto=true ",
+ "passwd/root-password={{ user `ssh_password` }} ",
+ "passwd/root-password-again={{ user `ssh_password` }} ",
"debconf/priority=critical ",
"preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `preseed_path` }} ",
"<enter>"
@@ -73,6 +76,8 @@
"/install/vmlinuz ",
"initrd=/install/initrd.gz ",
"auto=true ",
+ "passwd/root-password={{ user `ssh_password` }} ",
+ "passwd/root-password-again={{ user `ssh_password` }} ",
"debconf/priority=critical ",
"preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `preseed_path` }} ",
"<enter>"
@@ -112,6 +117,8 @@
"/install/vmlinuz ",
"initrd=/install/initrd.gz ",
"auto=true ",
+ "passwd/root-password={{ user `ssh_password` }} ",
+ "passwd/root-password-again={{ user `ssh_password` }} ",
"debconf/priority=critical ",
"preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `preseed_path` }} ",
"<enter>"