Skip to content

Commit a5386c7

Browse files
CarlFKstefanor
authored andcommitted
remove clutter (lc dir and #unused code)
1 parent ce27b9d commit a5386c7

3 files changed

Lines changed: 4 additions & 11 deletions

File tree

roles/tftp-server/defaults/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
netboot_image: https://deb.debian.org/debian/dists/stretch/main/installer-amd64/current/images/netboot/netboot.tar.gz
3-
# late_command_url: https://anonscm.debian.org/cgit/debconf-video/ansible.git/plain/setup_ansible.sh
4-
late_command_url: http://{{ inventory_hostname }}/lc/late_command.sh
3+
late_command_url: http://{{ inventory_hostname }}/late_command.sh
54

65
time_zone: UTC
76
domain: video.debconf.org
@@ -13,6 +12,7 @@ apt_proxy: false
1312
web_root: /var/www/html
1413

1514
user_name: videoteam
15+
# how to make the hash:
1616
# $ printf "r00tme" | mkpasswd -s -m md5
1717
user_password_hash: $1$G1uRZoLB$r68rPXmpJl/C6ervlynKa/
1818

roles/tftp-server/tasks/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
# owner: "{{ user_name }}"
2626
# group: "{{ user_name }}"
2727
with_items:
28-
- lc
2928
- d-i/xenial
3029
- d-i/jessie
3130
- d-i/stretch
@@ -43,7 +42,7 @@
4342
- name: push late_command.sh
4443
copy:
4544
src: files/late_command.sh
46-
dest: "{{ web_root }}/lc/late_command.sh"
45+
dest: "{{ web_root }}/late_command.sh"
4746

4847
- name: inject preseed into menu (find files)
4948
find:

roles/tftp-server/templates/preseed.cfg.j2

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -437,13 +437,7 @@ d-i preseed/early_command string cd /tmp && wget http://$url/ec/early_command.sh
437437
# still a usable /target directory. You can chroot to /target and use it
438438
# directly, or use the apt-install and in-target commands to easily install
439439
# packages and run commands in the target system.
440-
d-i preseed/late_command string cd /target/tmp && wget http://$url/lc/late_command.sh && chmod u+x late_command.sh && chroot /target unset http_proxy; ANSIBLE_UNDER_DI=1 /tmp/late_command.sh $(debconf-get mirror/suite) $(debconf-get passwd/username)
441-
442-
{% if late_command_url.startswith('tftp://') %}
443-
# d-i preseed/late_command string in-target sh -c "curl -o penultimate_setup.sh '{{ late_command_url }}' && ANSIBLE_UNDER_DI=1 sh penultimate_setup.sh && rm penultimate_setup.sh"
444-
{% else %}
445-
# d-i preseed/late_command string in-target sh -c "unset http_proxy; wget http://{{ inventory_hostname }}/lc/late_command.sh && ANSIBLE_UNDER_DI=1 sh late_command.sh && rm late_command.sh"
446-
{% endif %}
440+
d-i preseed/late_command string cd /target/tmp && wget http://$url/late_command.sh && chmod u+x late_command.sh && chroot /target unset http_proxy; ANSIBLE_UNDER_DI=1 /tmp/late_command.sh $(debconf-get mirror/suite) $(debconf-get passwd/username)
447441

448442
# don't ask for extra firmare
449443
d-i hw-detect/load_firmware boolean false

0 commit comments

Comments
 (0)