Build non-LVM image
diff --git a/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg b/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
index bfaa1fe..ce94590 100644
--- a/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
+++ b/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
@@ -21,3 +21,11 @@
upstart_dir: /etc/init/
ssh_svcname: ssh
+growpart:
+ mode: auto
+ devices: ['/']
+
+#swap:
+# filename: /swap.img
+# size: auto
+# maxsize: 1000000000
diff --git a/ubuntu-14.04/http/preseed.cfg b/ubuntu-14.04/http/preseed.cfg
index 0da2116..8ffddd9 100644
--- a/ubuntu-14.04/http/preseed.cfg
+++ b/ubuntu-14.04/http/preseed.cfg
@@ -12,11 +12,24 @@
d-i grub-installer/with_other_os boolean true
d-i netcfg/get_domain string unassigned-domain
d-i netcfg/get_hostname string unassigned-hostname
+
d-i partman-auto/method string regular
d-i partman/choose_partition select finish
d-i partman/confirm boolean true
d-i partman/confirm_nooverwrite boolean true
d-i partman/confirm_write_new_label boolean true
+d-i partman-basicfilesystems/no_swap boolean false
+d-i partman-auto/choose_recipe select boot-root
+
+d-i partman-auto/expert_recipe string \
+ boot-root:: \
+ 512 512 -1 ext4 \
+ $primary{ } $bootable{ } \
+ method{ format } format{ } \
+ use_filesystem{ } filesystem{ ext4 } \
+ mountpoint{ / } \
+ options/noatime{ noatime } \
+ . \
d-i pkgsel/include string openssh-server
d-i pkgsel/install-language-support boolean false
diff --git a/ubuntu-14.04/template.json b/ubuntu-14.04/template.json
index bfc4e8f..d7ac736 100644
--- a/ubuntu-14.04/template.json
+++ b/ubuntu-14.04/template.json
@@ -122,7 +122,7 @@
" netcfg/get_hostname=ubuntu-1404<wait>",
" netcfg/get_domain=cloudlab.cz<wait>",
" noapic<wait>",
- " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed-lvm.cfg<wait>",
+ " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>",
" -- <wait>",
"<enter><wait>"
],
@@ -170,7 +170,7 @@
" netcfg/get_hostname=ubuntu-1404<wait>",
" netcfg/get_domain=changeme<wait>",
" noapic<wait>",
- " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed-lvm.cfg<wait>",
+ " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>",
" -- <wait>",
"<enter><wait>"
],
@@ -236,7 +236,7 @@
" netcfg/get_hostname=ubuntu-1404<wait>",
" netcfg/get_domain=changeme<wait>",
" noapic<wait>",
- " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed-lvm.cfg<wait>",
+ " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>",
" -- <wait>",
"<enter><wait>"
]