From 7404d7ace4db0e543518bb5c54c4c9c39c1a67ee Mon Sep 17 00:00:00 2001
From: "Andreas B. Mundt" <andi@debian.org>
Date: Sat, 25 May 2019 10:39:32 +0300
Subject: [PATCH] Cleanup and minor improvements.

---
 roles/installbox2kiosk/tasks/main.yml  |  3 ++-
 roles/preseed-installer/tasks/main.yml | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/roles/installbox2kiosk/tasks/main.yml b/roles/installbox2kiosk/tasks/main.yml
index cef242d..d17d0be 100644
--- a/roles/installbox2kiosk/tasks/main.yml
+++ b/roles/installbox2kiosk/tasks/main.yml
@@ -60,7 +60,8 @@
       echo "{{ sshpubkey }}" >> /target/home/ansible/.ssh/authorized_keys ; \
       in-target chown -R ansible:ansible /home/ansible/.ssh/ ; \
       in-target chmod -R og= /home/ansible/.ssh/ ; \
-      in-target ansible-pull --verbose --purge --extra-vars="run_in_installer=true" -i localhost, --url=git://{{ hostname }}/.git
+      in-target ansible-pull --verbose --purge --extra-vars="run_in_installer=true" \
+                             -i localhost, --url=git://{{ hostname }}/.git
     marker: "# {mark} ANSIBLE MANAGED BLOCK preseed/late_command"
 
 - name: provide git repo if not available already
diff --git a/roles/preseed-installer/tasks/main.yml b/roles/preseed-installer/tasks/main.yml
index e1160e1..f5c12cf 100644
--- a/roles/preseed-installer/tasks/main.yml
+++ b/roles/preseed-installer/tasks/main.yml
@@ -22,9 +22,14 @@
     block: |
       TIMEOUT 100
       LABEL autoinstall
-         MENU LABEL Debian {{ di_dist }} (amd64) + preseed
+         MENU LABEL Debian {{ di_version }} (amd64) + preseed
          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://{{ hostname }}
+
+         #LABEL daily
+         #MENU LABEL Debian daily (amd64) + preseed
+         #kernel ::/d-i/n-a/daily/amd64/linux
+         #append initrd=::/d-i/n-a/daily/amd64/initrd.gz --- auto=true priority=critical url=tftp://{{ hostname }}
   notify: "rebuild di-netboot-assistant menu"
 
 - name: add auto efi boot entry to di-netboot-assistant
@@ -32,8 +37,13 @@
     dest: /etc/di-netboot-assistant/grub.cfg.HEAD
     insertbefore: EOF
     block: |
-      menuentry 'Debian stable (amd64) + preseed' {
+      menuentry 'Debian {{ di_version }} (amd64) + preseed' {
          linux   /d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/linux --- auto=true priority=critical url=tftp://{{ hostname }}
          initrd  /d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/initrd.gz
       }
+
+      #menuentry 'Debian daily (amd64) + preseed' {
+      #   linux   /d-i/n-a/daily/amd64/linux --- auto=true priority=critical url=tftp://{{ hostname }}
+      #   initrd  /d-i/n-a/daily/amd64/initrd.gz
+      #}
   notify: "rebuild di-netboot-assistant menu"