diff options
| -rw-r--r-- | playbooks/dione.yaml | 2 | ||||
| -rw-r--r-- | preseed/hosts/dione_debian-stretch.cfg | 26 | ||||
| -rw-r--r-- | roles/base/tasks/main.yaml | 2 |
3 files changed, 9 insertions, 21 deletions
diff --git a/playbooks/dione.yaml b/playbooks/dione.yaml index 8598ef06..ddf8a2a7 100644 --- a/playbooks/dione.yaml +++ b/playbooks/dione.yaml @@ -5,4 +5,4 @@ - role: base - role: sshserver - role: zsh - - role: kubernetes-base +# - role: kubernetes-base diff --git a/preseed/hosts/dione_debian-stretch.cfg b/preseed/hosts/dione_debian-stretch.cfg index 73b764b1..caca6f45 100644 --- a/preseed/hosts/dione_debian-stretch.cfg +++ b/preseed/hosts/dione_debian-stretch.cfg @@ -33,7 +33,6 @@ d-i time/zone string Europe/Vienna d-i clock-setup/ntp boolean false d-i partman-efi/non_efi_system boolean true -d-i partman-efi/no_efi boolean false d-i partman-auto/disk string /dev/nvme0n1 d-i partman-auto/method string lvm d-i partman-auto/purge_lvm_from_device boolean true @@ -49,6 +48,10 @@ d-i partman/default_label string gpt d-i partman-auto/choose_recipe select boot-root d-i partman-auto/expert_recipe string \ boot-root :: \ + 100 100 128 fat16 \ + $defaultignore{ } $primary{ } \ + $bootable{ } method{ efi } format{ } \ + . \ 1000 10000 -1 ext4 \ $defaultignore{ } $primary{ } \ method{ lvm } vg_name{ dione } \ @@ -95,7 +98,7 @@ d-i pkgsel/include string openssh-server python d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false -d-i grub-installer/skip boolean true +d-i grub-installer/choose_bootdev string /dev/nvme0n1 d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean false @@ -106,22 +109,5 @@ d-i finish-install/reboot_in_progress note d-i preseed/late_command string \ lvremove -f dione/dummy; \ - echo -e "g\nn\n1\n\n+128M\nn\n2\n\n+384M\nt\n1\n1\nt\n2\n20\nw\n" | fdisk /dev/sda; \ - mkfs.fat /dev/sda1; \ - mkfs.ext4 /dev/sda2; \ - mkdir /target/newboot; \ - mount /dev/sda2 /target/newboot; \ - rmdir /target/newboot/lost+found; \ - mkdir /target/newboot/efi; \ - mount /dev/sda1 /target/newboot/efi; \ - cp -par /target/boot/* /target/newboot; \ - umount /target/newboot/efi; \ - umount /target/newboot; \ - rm -rf /target/newboot; \ - mount /dev/sda2 /target/boot; \ - mount /dev/sda1 /target/boot/efi; \ - echo "/dev/sda2 /boot ext4 defaults 0 0" >> /target/etc/fstab; \ - echo "/dev/sda1 /boot/efi vfat defaults 0 0" >> /target/etc/fstab; \ - in-target bash -c "echo 'grub-efi-amd64 grub2/linux_cmdline_default string quiet nomodeset' | debconf-set-selections && apt-get install -y -q grub-efi"; \ - in-target bash -c "grub-install /dev/sda && update-grub"; \ + in-target bash -c "sed 's#GRUB_CMDLINE_LINUX_DEFAULT.*#GRUB_CMDLINE_LINUX_DEFAULT=\"quiet nomodeset\"#' -i /etc/default/grub && update-grub"; \ in-target bash -c "passwd -d root; passwd -l root; umask 077; mkdir -p /root/.ssh/; echo -e 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtmysXjBidEwJek6hBgaENiyVOwroFi19xRZZw+cYYqi6asDfF6B/h6gYNkJGWo0rD5ZaLdau1O210O5Xu+TfK1e2bZbxuFIj2fguUkat9wN6IQIO2m2Wcf4k/eiTmtAE3dp0l5ThMqfxxE8dj76mOOrUHCfJUIVoATGs4X5TLcGcXroAcZ+DFFoDzjxjFYNmIuUNtXDwXTpPc63SAYmRvW0ZYZlvH1qZ6irLh+GtE1dZ1Q5lQZvp6xUYcjInbpcd5Ko3KbG/In7sNmUCI7iaTwC4DPDTcHFj99Ll1jruAbdaQqe+ClZv55dbQ+92RDF6fsuQBD8FeRz7nYChvCqNPT1KOvcVsDtbW0iJ1PZ05QdE27w23wJj9OE0JWM09P3AH3ttswHaJ+P4s7mSxxK2m6YZcqop3czLlWWoGna0ynd5eV6l/rtvAQUvBOXjKQ5fPQY5d9cF0Z87NBE54HM9a/IKZ2toU2MuYNUpI/DUoAA9ILS4bJm3AUz8wbaC5EiuIhbM6I/u0NANamaQKRrolGNP4ETaQvhABs+S3/NSSBy4DMjtwax2BxyenF6i89vyHPNY+LZzBOn842yUlEGn6Z11MxiE5fhIfMPUclSYi5bQJDf1fvAyAo59/AX8sPqRK+/OCLIgLwdtW6D4OZGXjqrBJe2j/5uZSJEsl6ROyKw== equinox@spreadspace.org' > /root/.ssh/authorized_keys" diff --git a/roles/base/tasks/main.yaml b/roles/base/tasks/main.yaml index a4481920..fa4efc07 100644 --- a/roles/base/tasks/main.yaml +++ b/roles/base/tasks/main.yaml @@ -27,6 +27,8 @@ - aptitude - ca-certificates - file + - man-db + - manpages - name: Remove startup message from screen lineinfile: |