summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-01-18 01:31:12 +0100
committervarac <varacanero@zeromail.org>2016-01-18 01:31:12 +0100
commit5b3c1c9b7fe7a145f9dbb04448bb42028301381d (patch)
tree278751764c2dcf5cb2043a06e0d6f8ffca460c41
parent07ae3145dba2e373815ed846fea732f71cbe24c1 (diff)
fixed locales, hostname, one partition
-rw-r--r--http/preseed.cfg16
-rw-r--r--jessie.json6
-rw-r--r--scripts/custom.sh3
3 files changed, 7 insertions, 18 deletions
diff --git a/http/preseed.cfg b/http/preseed.cfg
index fb672eb..882f671 100644
--- a/http/preseed.cfg
+++ b/http/preseed.cfg
@@ -31,33 +31,17 @@ d-i partman-auto/purge_lvm_from_device boolean true
d-i partman-auto-lvm/new_vg_name string debian
d-i partman-basicfilesystems/no_swap boolean false
-# Boot: 256MB
# Root: At least 4GB, will fill to the end of the disk
# Var: 4GB
d-i partman-auto/expert_recipe string \
boot-root :: \
- 256 1000 256 ext4 \
- $primary{ } \
- $bootable{ } \
- method{ format } format{ } \
- use_filesystem{ } filesystem{ ext4 } \
- mountpoint{ /boot } \
- options/noatime{ noatime } \
- . \
4096 10000 1000000000 ext4 \
$lvmok{ } lv_name{ root } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ / } \
options/noatime{ noatime } \
- . \
- 4096 5000 4096 ext4 \
- $lvmok{ } lv_name{ var } \
- method{ format } format{ } \
- use_filesystem{ } filesystem{ ext4 } \
- mountpoint{ /var } \
- options/noatime{ noatime } \
.
d-i base-installer/install-recommends boolean false
diff --git a/jessie.json b/jessie.json
index 4a8d23e..a7dc84c 100644
--- a/jessie.json
+++ b/jessie.json
@@ -8,7 +8,8 @@
"atlas_name": "{{env `ATLAS_NAME`}}",
"disk_size": "10000",
"password": "vagrant",
- "user": "vagrant"
+ "user": "vagrant",
+ "hostname": "varac-jessie"
},
"provisioners": [
{
@@ -40,9 +41,10 @@
"<esc><wait><wait>",
"install auto <wait>",
"preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg <wait>",
- "debian-installer=en_US locale=en_AU.UTF-8 keymap=us <wait>",
+ "debian-installer=en_US locale=en_US.UTF-8 keymap=us <wait>",
"netcfg/get_hostname={{ .Name }} <wait>",
"netcfg/get_domain={{ user `domain`}} <wait>",
+ "hostname={{user `hostname`}} ",
"fb=false debconf/frontend=noninteractive <wait>",
"passwd/user-fullname={{user `user`}} <wait>",
"passwd/user-password={{user `password`}} <wait>",
diff --git a/scripts/custom.sh b/scripts/custom.sh
index 0e4e3a2..f178362 100644
--- a/scripts/custom.sh
+++ b/scripts/custom.sh
@@ -5,3 +5,6 @@ sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_c
# Set root pw
usermod -p "$(echo vagrant | openssl passwd -1 -stdin)" root
+
+# install additional packages
+apt-get install puppet lsb-release facter