diff --git a/installbox.yml b/installbox.yml index 27aeb82..fac5ea7 100644 --- a/installbox.yml +++ b/installbox.yml @@ -33,7 +33,7 @@ - transparent-squid - tftp-netboot-installer - preseed-installer -# - installbox2kiosk # enable this to install kiosk automatically + - installbox2kiosk post_tasks: - name: make sure hostname is set correctly in /etc/hosts diff --git a/roles/installbox2kiosk/tasks/main.yml b/roles/installbox2kiosk/tasks/main.yml index d17d0be..0da71cf 100644 --- a/roles/installbox2kiosk/tasks/main.yml +++ b/roles/installbox2kiosk/tasks/main.yml @@ -61,7 +61,7 @@ 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 + -i localhost, --url=git://{{ hostname }}/.git $playbook 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 72e1de6..3a37138 100644 --- a/roles/preseed-installer/tasks/main.yml +++ b/roles/preseed-installer/tasks/main.yml @@ -24,12 +24,12 @@ LABEL autoinstall 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 }} + append initrd=::/d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/initrd.gz auto=true priority=critical url=tftp://{{ hostname }} playbook=kiosk.yml --- #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 }} + #append initrd=::/d-i/n-a/daily/amd64/initrd.gz auto=true priority=critical url=tftp://{{ hostname }} playbook=kiosk.yml --- notify: "rebuild di-netboot-assistant menu" - name: add auto efi boot entry to di-netboot-assistant @@ -38,12 +38,12 @@ insertbefore: EOF block: | 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 }} + linux /d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/linux auto=true priority=critical url=tftp://{{ hostname }} playbook=kiosk.yml --- 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 }} + # linux /d-i/n-a/daily/amd64/linux auto=true priority=critical url=tftp://{{ hostname }} playbook=kiosk.yml --- # initrd /d-i/n-a/daily/amd64/initrd.gz #} notify: "rebuild di-netboot-assistant menu"