From f3d2d5ca9b958612101618d34d7440d46c57711a Mon Sep 17 00:00:00 2001
From: "Andreas B. Mundt" <andi@debian.org>
Date: Sun, 12 Jun 2022 17:35:36 +0200
Subject: [PATCH] Add 'cloudbox' to installbox examples.

---
 roles/dnsmasq/templates/dnsmasq-dhcp.j2 |  2 +-
 roles/prepare4clients/tasks/main.yml    | 25 +++++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/roles/dnsmasq/templates/dnsmasq-dhcp.j2 b/roles/dnsmasq/templates/dnsmasq-dhcp.j2
index 29f73dd..77201cf 100644
--- a/roles/dnsmasq/templates/dnsmasq-dhcp.j2
+++ b/roles/dnsmasq/templates/dnsmasq-dhcp.j2
@@ -1,3 +1,3 @@
 interface={{ if_lan }}
 dhcp-range={{ dhcp_start }},{{ dhcp_stop }},2h
-dhcp-generate-names
+# dhcp-generate-names ## better use grub to generate names
diff --git a/roles/prepare4clients/tasks/main.yml b/roles/prepare4clients/tasks/main.yml
index 643e98c..3bc1ffc 100644
--- a/roles/prepare4clients/tasks/main.yml
+++ b/roles/prepare4clients/tasks/main.yml
@@ -57,7 +57,7 @@
                              -i localhost, --url=git://{{ ansible_hostname }}/.git $playbook
     marker: "# {mark} ANSIBLE MANAGED BLOCK preseed/late_command"
 
-- name: add kiosk auto pxe boot entry to di-netboot-assistant
+- name: add pxe boot entries to di-netboot-assistant
   blockinfile:
     dest: /etc/di-netboot-assistant/pxelinux.HEAD
     insertbefore: EOF
@@ -69,10 +69,15 @@
          kernel ::/d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/linux
          append initrd=::/d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/initrd.gz mirror/http/proxy?=http://{{ ansible_hostname }}:3142/ pkgsel/include=etckeeper preseed/late_command="rm -fv /target/etc/apt/apt.conf" ---
 
-      LABEL autoinstall
+      LABEL kiosk
          MENU LABEL Debian {{ di_version }} (amd64) + preseed + kiosk.yml
          kernel ::/d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/linux
-         append initrd=::/d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/initrd.gz auto=true priority=critical url=tftp://{{ ansible_hostname }} playbook=kiosk.yml ---
+         append initrd=::/d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/initrd.gz hostname=kiosk auto=true priority=critical url=tftp://{{ ansible_hostname }} playbook=kiosk.yml ---
+
+      LABEL cloudbox
+         MENU LABEL Debian {{ di_version }} (amd64) + preseed + cloudbox.yml
+         kernel ::/d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/linux
+         append initrd=::/d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/initrd.gz hostname=cloudbox auto=true priority=critical url=tftp://{{ ansible_hostname }} playbook=cloudbox.yml ---
 
          #LABEL daily
          #MENU LABEL Debian daily (amd64) + preseed + kiosk.yml
@@ -81,7 +86,7 @@
     marker: "# {mark} ANSIBLE MANAGED BLOCK kiosk"
   notify: "rebuild di-netboot-assistant menu"
 
-- name: add kiosk auto efi boot entry to di-netboot-assistant
+- name: add efi boot entries to di-netboot-assistant
   blockinfile:
     dest: /etc/di-netboot-assistant/grub.cfg.HEAD
     insertbefore: EOF
@@ -96,7 +101,15 @@
 
       menuentry 'Debian {{ di_version }} (amd64) + preseed + kiosk.yml' {
          linux   /d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/linux \
-                   auto=true priority=critical url=tftp://{{ ansible_hostname }} playbook=kiosk.yml ---
+                   hostname=kiosk auto=true priority=critical \
+                   url=tftp://{{ ansible_hostname }} playbook=kiosk.yml ---
+         initrd  /d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/initrd.gz
+      }
+
+      menuentry 'Debian {{ di_version }} (amd64) + preseed + cloudbox.yml' {
+         linux   /d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/linux \
+                   hostname=cloudbox auto=true priority=critical \
+                   url=tftp://{{ ansible_hostname }} playbook=cloudbox.yml ---
          initrd  /d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/initrd.gz
       }
 
@@ -185,7 +198,6 @@
 
 ######################
 
-
 - name: provide git repo if not available already # noqa git-latest
   git:
     repo: 'https://salsa.debian.org/andi/debian-lan-ansible.git'
@@ -212,3 +224,4 @@
     block: |
       [kerberox-client]
       {{ in_inventory }}
+  when: krb5kdc.stat.exists or samba.stat.exists