summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2019-12-08 13:28:30 +0200
committerLars Wirzenius <liw@liw.fi>2019-12-08 13:28:30 +0200
commit4deb74c6c501f5b9d9c7d65aac73057b90b994fe (patch)
treecbe3dfd4f1465a4e7b18b36cecf235394d1e0ff4
parenta6f5cf4b9e56dc28cc0cd579051bbf9526de82cb (diff)
downloadbase-image-specs-4deb74c6c501f5b9d9c7d65aac73057b90b994fe.tar.gz
Fix: minimal buster builds
-rwxr-xr-xbuild-all.sh2
-rw-r--r--minimal.vmdb7
-rw-r--r--minimal.yml16
3 files changed, 12 insertions, 13 deletions
diff --git a/build-all.sh b/build-all.sh
index e8d6701..3551558 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -7,7 +7,7 @@ image()
local img="$1"
local tarball="$2"
- vmdb2 base.vmdb \
+ vmdb2 minimal.vmdb \
--output "$img" \
--verbose \
--log base.log \
diff --git a/minimal.vmdb b/minimal.vmdb
index bc915d6..3a30e31 100644
--- a/minimal.vmdb
+++ b/minimal.vmdb
@@ -39,9 +39,8 @@ steps:
- cache-rootfs: /
unless: rootfs_unpacked
- - ansible:
- playbook: minimal.yml
+ - ansible: /
+ playbook: minimal.yml
- grub: bios
- tag: rootfs
- console: serial
+ tag: /
diff --git a/minimal.yml b/minimal.yml
index 1765119..8fd485a 100644
--- a/minimal.yml
+++ b/minimal.yml
@@ -1,14 +1,10 @@
-hosts: image
-tasks:
+- hosts: image
+
+ tasks:
- name: disable root password
- chroot: |
+ shell: |
passwd -l root
- - name: set hostname in /etc/hostname and /etc/hosts
- chroot: |
- echo "{{ hostname }}" > /etc/hostname
- sed -i 's/^127\.0\.1\.1/& localhost {{ hostname }}' /etc/hosts
-
- name: install root ssh authorized_keys
authorized_key:
user: root
@@ -21,3 +17,7 @@ tasks:
auto eth0
iface eth0 inet dhcp
dest: /etc/network/interfaces.d/eth0
+
+ vars:
+ root_authorized_keys: |
+ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAlECa3tbFGXhB3Zh/4/GhM11THOThVfiuLqqJ2dpWHEClzpKJHpzzwWt7g9z/MMQNMsUJLy+okz+De6hdjjmYJ9kG9Sr3H4YKq6itGQMj7L/cH3WS3ynp0uy0oW3hf932vDZKQ8iy9vczXH+ERYl+4TYae1Jp4Hyf4/2IYxEfuhKctvSvqySST3Qk9JNZ71HFGOWhjH/MmoCLoT1v+HkqmHdYf/GMKGRo3gqCEGgCgNErYYIyKm3OF3dHXK+hyGLE/cZNu6fU5woW3rvtUCFt08Ri2pm0cnXXJn9jQIMxfS5Kkf64svwgzKmPqgX1f4flopYPlsBXduCgzbJvj+lpgauAk/i1A5B01CFa9sI4C6pHZmwk1qxRwN+4IXL2CQt+tDgYC84ZDDd8R7cNyL22a3KhMQmdHtvog1beAa3Ab+J+cafkXXN+Es9f1wQjzk7DiHupmJIVofBvPP+cRcB46rwha6ati8Fa5QkT9rXFNqQsKk7jq8TIi54Bm15OOa0jInGG3TM17b9Ftu2WTJSAaqgBnDfZiInK7HEvC6K/IBljrN3oGagmFZPrAvzw7d6C2/nKFAQtfoMcE5oWVDrJyjsmJ8oaru0E8rwj7mMvyKPgEMnXTGXLWDgEo50+i291m4bkCxVwiOPbPRvdMll1Y8qfBAPT76sY4Ikgcw/2iw== openpgp:0xBBE80E50