diff -Nru di-netboot-assistant-0.73/config/grub.cfg.HEAD di-netboot-assistant-0.74/config/grub.cfg.HEAD --- di-netboot-assistant-0.73/config/grub.cfg.HEAD 2022-02-25 10:28:50.000000000 +0000 +++ di-netboot-assistant-0.74/config/grub.cfg.HEAD 2022-06-24 09:27:42.000000000 +0000 @@ -38,7 +38,8 @@ # # Use a temporary package cache during installation, other default locale, install etckeeper. #menuentry 'Debian stable (amd64) + tmp-pkg-cache + locale' { -# linux /d-i/n-a/stable/amd64/linux locale?=de_DE mirror/http/proxy?=http://192.168.122.1:3142/ pkgsel/include=etckeeper preseed/late_command="rm -fv /target/etc/apt/apt.conf" --- +# linux /d-i/n-a/stable/amd64/linux locale?=de_DE mirror/http/proxy?=http://192.168.122.1:3142/ \ +# pkgsel/include=etckeeper preseed/late_command="rm -fv /target/etc/apt/apt.conf" --- # initrd /d-i/n-a/stable/amd64/initrd.gz #} # @@ -53,7 +54,8 @@ #menuentry 'Debian stable (amd64) + preseed + example.yml' { # ## generate hostname from MAC address: # regexp --set=1:oct4 --set=2:oct5 --set=3:oct6 "\:([[:xdigit:]]+)\:([[:xdigit:]]+)\:([[:xdigit:]]+)\$" $net_default_mac -# linux /d-i/n-a/stable/amd64/linux auto=true priority=critical hostname=${oct4}${oct5}${oct6} url=tftp://installbox playbook=example.yml --- +# linux /d-i/n-a/stable/amd64/linux auto=true priority=critical hostname=${oct4}${oct5}${oct6} \ +# url=tftp://installbox playbook=example.yml --- # initrd /d-i/n-a/stable/amd64/initrd.gz #} # diff -Nru di-netboot-assistant-0.73/config/ipxemenu.HEAD di-netboot-assistant-0.74/config/ipxemenu.HEAD --- di-netboot-assistant-0.73/config/ipxemenu.HEAD 2022-02-25 10:28:50.000000000 +0000 +++ di-netboot-assistant-0.74/config/ipxemenu.HEAD 2022-06-24 09:27:42.000000000 +0000 @@ -6,8 +6,11 @@ set 210:string tftp://${next-server}/ menu iPXE Boot Menu -# Use a temporary package cache during installation, other default locale, install etckeeper. +#item --gap -- -- Customized Boot Entries -- +## Use a temporary package cache during installation, other default locale, install etckeeper: #item customized Debian stable (amd64) + tmp-pkg-cache + locale +## Chainload another ipxe menu: +#item othermenu load another menu item --gap -- -- Netboot Installer Images -- # END_INSTALLER_MENU # do not remove this marker @@ -21,12 +24,18 @@ choose --default exit --timeout 600000 target && goto ${target} -:chainload iseq ${platform} efi && chain ${210:string}d-i/n-a/bootnetx64.efi || chain ${210:string}d-i/n-a/pxelinux.0 +:chainload iseq ${platform} efi && chain ${210:string}d-i/n-a/bootnetx64.efi \ + || chain ${210:string}d-i/n-a/pxelinux.0 :customized - kernel ${210:string}d-i/n-a/stable/amd64/linux initrd=initrd.gz locale?=de_DE mirror/http/proxy?=http://192.168.122.1:3142/ pkgsel/include=etckeeper preseed/late_command="rm -fv /target/etc/ apt/apt.conf" --- + kernel ${210:string}d-i/n-a/stable/amd64/linux initrd=initrd.gz \ + locale?=de_DE mirror/http/proxy?=http://192.168.122.1:3142/ \ + pkgsel/include=etckeeper preseed/late_command="rm -fv /target/etc/ apt/apt.conf" --- initrd ${210:string}d-i/n-a/stable/amd64/initrd.gz boot +:othermenu + chain tftp://example.org/d-i/n-a/othermenu.ipxe + # #################################################################### diff -Nru di-netboot-assistant-0.73/debian/changelog di-netboot-assistant-0.74/debian/changelog --- di-netboot-assistant-0.73/debian/changelog 2022-02-25 10:28:50.000000000 +0000 +++ di-netboot-assistant-0.74/debian/changelog 2022-06-24 09:27:42.000000000 +0000 @@ -1,3 +1,11 @@ +di-netboot-assistant (0.74) unstable; urgency=medium + + * Add more examples to boot menus and break long lines. + * Add dependency to provide '/usr/bin/strings'. + * Bump Standards-Version to 4.6.1 (no changes needed). + + -- Andreas B. Mundt Fri, 24 Jun 2022 11:27:42 +0200 + di-netboot-assistant (0.73) unstable; urgency=medium * Start configuring salsa CI. diff -Nru di-netboot-assistant-0.73/debian/control di-netboot-assistant-0.74/debian/control --- di-netboot-assistant-0.73/debian/control 2022-02-25 10:28:50.000000000 +0000 +++ di-netboot-assistant-0.74/debian/control 2022-06-24 09:27:42.000000000 +0000 @@ -6,13 +6,13 @@ Build-Depends: bash-completion, debhelper-compat (= 13) Rules-Requires-Root: no Homepage: https://wiki.debian.org/DebianInstaller/NetbootAssistant -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Vcs-Browser: https://salsa.debian.org/installer-team/netboot-assistant Vcs-Git: https://salsa.debian.org/installer-team/netboot-assistant.git Package: di-netboot-assistant Architecture: all -Depends: ca-certificates, wget | curl, ${misc:Depends} +Depends: ca-certificates, wget | curl, binutils, ${misc:Depends} Recommends: tftpd-hpa | atftpd | dnsmasq Suggests: dnsmasq | isc-dhcp-server | udhcpd, syslinux, vim-addon-manager Description: Debian-Installer netboot assistant diff -Nru di-netboot-assistant-0.73/debian/copyright di-netboot-assistant-0.74/debian/copyright --- di-netboot-assistant-0.73/debian/copyright 2022-02-25 10:28:50.000000000 +0000 +++ di-netboot-assistant-0.74/debian/copyright 2022-06-24 09:27:42.000000000 +0000 @@ -1,5 +1,5 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Source: https://anonscm.debian.org/cgit/d-i/netboot-assistant.git +Source: https://salsa.debian.org/installer-team/netboot-assistant Files: * Copyright: 2008-2014 Frank Lin PIAT diff -Nru di-netboot-assistant-0.73/di-netboot-assistant di-netboot-assistant-0.74/di-netboot-assistant --- di-netboot-assistant-0.73/di-netboot-assistant 2022-02-25 10:28:50.000000000 +0000 +++ di-netboot-assistant-0.74/di-netboot-assistant 2022-06-24 09:27:42.000000000 +0000 @@ -26,7 +26,7 @@ # ------------------ Declare the constants ------------------- # PACKAGE_NAME=di-netboot-assistant -PACKAGE_VERSION=0.73 +PACKAGE_VERSION=0.74 # -------------- Initialize the global variables ------------- # OFFLINE=false