Bug#1056169: bookworm-pu: package di-netboot-assistant/0.78~deb12u1

2023-11-18 Thread Andreas B. Mundt 
Hi Kibi,

thank you for your comment and explanation!

On Sat, Nov 18, 2023 at 10:11:33AM +0100, Cyril Brulebois wrote:
>
> […] 
> 
> The versioning seems a little weird.
> 
> Usually:
>  - either one cherry-picks stuff on top of the stable package, and uses
>0.76+deb12u1;
>  - or one ships a rebuild of the testing/unstable into stable, and uses
>0.78~deb12u1 (adding a changelog entry on top of unstable's,
>similarly to what would be done for backports).
> 
> Glancing very briefly at the patch and the git tree, it seems like
> you're doing the latter but versioning it like the former. I'll let
> others comment as to whether that's some nitpicking that should be
> ignored, or something they'd like to see adjusted.

Ah, you are absolutely right, makes sense.  I started with a
0.76+deb12u1 package, realized that cherry-picking ended up at 0.78,
adjusted the version number … but I wasn't aware that the changelog
should also be 'reset' to the one from 0.78 (which, I agree, makes
perfectly sense).  If needed, I can provide another upload.

Thanks and best regards,

  Andi

Bug#1056169: bookworm-pu: package di-netboot-assistant/0.78~deb12u1

2023-11-18 Thread Cyril Brulebois 
Hi Andreas,

And thanks for keeping an eye on netboot-assistant.

Andreas B. Mundt  (2023-11-18):
> +di-netboot-assistant (0.78~deb12u1) bookworm; urgency=medium
> +
> +  * Fixes for bookworm live iso image inclusion.
> +  * Update/add/fix preseed examples.  Thanks to Holger Wansing.
> +
> + -- Andreas B. Mundt   Sun, 18 Jun 2023 09:11:47 +0200
> +
>  di-netboot-assistant (0.76) unstable; urgency=medium

The versioning seems a little weird.

Usually:
 - either one cherry-picks stuff on top of the stable package, and uses
   0.76+deb12u1;
 - or one ships a rebuild of the testing/unstable into stable, and uses
   0.78~deb12u1 (adding a changelog entry on top of unstable's,
   similarly to what would be done for backports).

Glancing very briefly at the patch and the git tree, it seems like
you're doing the latter but versioning it like the former. I'll let
others comment as to whether that's some nitpicking that should be
ignored, or something they'd like to see adjusted.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Bug#1056169: bookworm-pu: package di-netboot-assistant/0.78~deb12u1

2023-11-17 Thread Andreas B. Mundt 
Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian@packages.debian.org
Usertags: pu
X-Debbugs-Cc: di-netboot-assist...@packages.debian.org, a...@debian.org
Control: affects -1 + src:di-netboot-assistant

[ Reason ]
With Bookworm, a few modifications have happened to the Debian Live ISO
images' meta data [1].  These changes make di-netboot-assistant
partially fail when bookworm ISO images are in use (the menus for the
network boot loaders like grub and iPXE are not generated properly).

The Live ISO images side has improved and stabilized [2], and also
di-netboot-assistant has been made more robust to account for these
modifications.  In addition a few minor fixes to documentation and
examples (bookworm, preseed file) have been applied.

[1] https://lists.debian.org/debian-live/2023/06/msg00023.html
[2] https://lists.debian.org/debian-live/2023/07/msg00030.html

[ Impact ]
The inclusion of bookworm live ISO images fails.

[ Tests ]
I tested the changes with the 12.2.0 gnome, kde and standard ISOs.
Grub and iPXE menu.

[ Risks ]
There are almost no risks involved.

[ Checklist ]
  [X] *all* changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in (old)stable
  [X] the issue is verified as fixed in unstable

[ Changes ]
Mostly parsing latest meta data from the live images and more robust
handling of kernel/initrd (with/without version number).

[ Other info ]
I'll already upload the updated package.
The release team is doing a great job, thank you!
diff -Nru di-netboot-assistant-0.76/config/grub.cfg.HEAD 
di-netboot-assistant-0.78~deb12u1/config/grub.cfg.HEAD
--- di-netboot-assistant-0.76/config/grub.cfg.HEAD  2023-03-16 
17:05:12.0 +0100
+++ di-netboot-assistant-0.78~deb12u1/config/grub.cfg.HEAD  2023-06-18 
09:11:47.0 +0200
@@ -18,7 +18,7 @@
 set default='Boot from local disk..'
 #set timeout=10
 
-if background_image 
/d-i/n-pkg/images/11/amd64/text/debian-installer/amd64/boot-screens/splash.png; 
then
+if background_image 
/d-i/n-pkg/images/12/amd64/text/debian-installer/amd64/boot-screens/splash.png; 
then
   set color_normal=light-gray/black
   set color_highlight=white/black
 elif background_image /d-i/n-a/stable/amd64/boot-screens/splash.png; then
diff -Nru di-netboot-assistant-0.76/debian/changelog 
di-netboot-assistant-0.78~deb12u1/debian/changelog
--- di-netboot-assistant-0.76/debian/changelog  2023-03-16 17:05:12.0 
+0100
+++ di-netboot-assistant-0.78~deb12u1/debian/changelog  2023-06-18 
09:11:47.0 +0200
@@ -1,3 +1,10 @@
+di-netboot-assistant (0.78~deb12u1) bookworm; urgency=medium
+
+  * Fixes for bookworm live iso image inclusion.
+  * Update/add/fix preseed examples.  Thanks to Holger Wansing.
+
+ -- Andreas B. Mundt   Sun, 18 Jun 2023 09:11:47 +0200
+
 di-netboot-assistant (0.76) unstable; urgency=medium
 
   * Fix typo in preseeding example.
diff -Nru di-netboot-assistant-0.76/di-netboot-assistant 
di-netboot-assistant-0.78~deb12u1/di-netboot-assistant
--- di-netboot-assistant-0.76/di-netboot-assistant  2023-03-16 
17:05:12.0 +0100
+++ di-netboot-assistant-0.78~deb12u1/di-netboot-assistant  2023-06-18 
09:11:47.0 +0200
@@ -26,7 +26,7 @@
 
 # -- Declare the constants --- #
 PACKAGE_NAME=di-netboot-assistant
-PACKAGE_VERSION=0.76
+PACKAGE_VERSION=0.78
 
 # -- Initialize the global variables - #
 OFFLINE=false
@@ -253,8 +253,8 @@
 # Returns: (EXIT STATUS) 0=Success, 1=Error
 #  #
 prepare_grub() {
-local v="" opt=$1 VERS V GRUB AR DIR 
-
+local v="" opt=$1 VERS V GRUB AR DIR
+
 $VERBOSE && v="-v"
 [ -z "$opt"  ] && [ -d $TFTP_ROOT/$N_A_DIR/grub ] && return 0
 
@@ -263,7 +263,7 @@
 [ ! -e "$TFTP_ROOT/debian-installer" ] && \
 ln -srv $TFTP_ROOT/$N_A_DIR/ $TFTP_ROOT/debian-installer
 
-for AR in x64 aa64 ; do 
+for AR in x64 aa64 ; do
 ## We link bootnet*.efi and grub*.efi from the latest available image:
 echo "I: Preparing EFI executables for '${AR}'."
 GRUB=""
@@ -533,7 +533,7 @@
 
 EOF
 sed -i "s%\(\# END_PKG_LIVE_MENU.*\)%item $tag $title\n\1%" menu.ipxe
-
+
 for AR in amd64 arm64 ; do
 gcfg="${TFTP_ROOT}/${relpath}/debian-installer/${AR}/grub/grub.cfg"
 if [ -f "$gcfg" ] ; then
@@ -560,7 +560,7 @@
 relpath=$(dirname "$x" | sed -e "s#${TFTP_ROOT}##" -e "s#^/*##" -e 
"s#\/.disk##")
 # shellcheck disable=SC2034
 ISO_NAME=$(basename "$relpath")
-title=$(sed -e "s#Official ##" -e "s#T.*\$##" "$x")
+title="$(sed -e "s#Official ##" -e 
"s#\(T\|-\)[0-9]\{2\}:[0-9]\{2\}\$##" "$x")"
 ## We cannot modify the iso images, copy grub.cfg instead:
 cfg="${TFTP_ROOT}/${relpath}/isolinux/menu.cfg"
 ncfgdir="live/pxe-${relpath//'/'/'_'}"
@@ -578,9