Cleanup and minor improvements.
This commit is contained in:
		
							parent
							
								
									fdfd702130
								
							
						
					
					
						commit
						7404d7ace4
					
				
					 2 changed files with 14 additions and 3 deletions
				
			
		| 
						 | 
					@ -60,7 +60,8 @@
 | 
				
			||||||
      echo "{{ sshpubkey }}" >> /target/home/ansible/.ssh/authorized_keys ; \
 | 
					      echo "{{ sshpubkey }}" >> /target/home/ansible/.ssh/authorized_keys ; \
 | 
				
			||||||
      in-target chown -R ansible:ansible /home/ansible/.ssh/ ; \
 | 
					      in-target chown -R ansible:ansible /home/ansible/.ssh/ ; \
 | 
				
			||||||
      in-target chmod -R og= /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"
 | 
					    marker: "# {mark} ANSIBLE MANAGED BLOCK preseed/late_command"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- name: provide git repo if not available already
 | 
					- name: provide git repo if not available already
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,9 +22,14 @@
 | 
				
			||||||
    block: |
 | 
					    block: |
 | 
				
			||||||
      TIMEOUT 100
 | 
					      TIMEOUT 100
 | 
				
			||||||
      LABEL autoinstall
 | 
					      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
 | 
					         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 }}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					         #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"
 | 
					  notify: "rebuild di-netboot-assistant menu"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- name: add auto efi boot entry to di-netboot-assistant
 | 
					- name: add auto efi boot entry to di-netboot-assistant
 | 
				
			||||||
| 
						 | 
					@ -32,8 +37,13 @@
 | 
				
			||||||
    dest: /etc/di-netboot-assistant/grub.cfg.HEAD
 | 
					    dest: /etc/di-netboot-assistant/grub.cfg.HEAD
 | 
				
			||||||
    insertbefore: EOF
 | 
					    insertbefore: EOF
 | 
				
			||||||
    block: |
 | 
					    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 }}
 | 
					         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
 | 
					         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"
 | 
					  notify: "rebuild di-netboot-assistant menu"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue