From 7b97fe869768b3759366bc225eb9184181f314d9 Mon Sep 17 00:00:00 2001
From: "David M. Syzdek" <david@syzdek.net>
Date: Wed, 17 Mar 2021 14:53:39 -0800
Subject: dban: fixing label and makefiles

---
 src/distros/dban/cfg.label | 22 +++++++++++-----------
 src/distros/dban/make.boot |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/distros/dban/cfg.label b/src/distros/dban/cfg.label
index f7e5925..cad4650 100644
--- a/src/distros/dban/cfg.label
+++ b/src/distros/dban/cfg.label
@@ -3,57 +3,57 @@ MENU TITLE Darik's Boot And Nuke @VERSION@
 
 label  dban_dban
     MENU LABEL dban_dban:     Default
-    linux /boot/dban/dban.bzi
+    linux /boot/dban/dban-@VERSION@-@ARCH@.bzi
     APPEND nuke="dwipe" silent vga=785
 
 label  dban_autonuke
     MENU LABEL dban_autonuke: Be really sure.
-    linux /boot/dban/dban.bzi
+    linux /boot/dban/dban-@VERSION@-@ARCH@.bzi
     APPEND nuke="dwipe --autonuke" silent vga=785
 
 label  dban_dod
     MENU LABEL dban_dod:      US Department of Defense 5220.22-M standard wipe.
-    linux /boot/dban/dban.bzi
+    linux /boot/dban/dban-@VERSION@-@ARCH@.bzi
     APPEND nuke="dwipe --autonuke --method dod522022m" silent vga=785
 
 label  dban_dod3pass
     MENU LABEL dban_dod3pass: DoD short wipe, passess 1,2,7 from the standard wipe.
-    linux /boot/dban/dban.bzi
+    linux /boot/dban/dban-@VERSION@-@ARCH@.bzi
     APPEND nuke="dwipe --autonuke --method dod3pass" silent vga=785
 
 label  dban_dodshort
     MENU LABEL dban_dod3pass: DoD short wipe, passess 1,2,7 from the standard wipe.
-    linux /boot/dban/dban.bzi
+    linux /boot/dban/dban-@VERSION@-@ARCH@.bzi
     APPEND nuke="dwipe --autonuke --method dodshort" silent vga=785
 
 label  dban_gutmann
     MENU LABEL dban_gutmann:  Peter Gutmann's wipe.
-    linux /boot/dban/dban.bzi
+    linux /boot/dban/dban-@VERSION@-@ARCH@.bzi
     APPEND nuke="dwipe --autonuke --method gutmann" silent vga=785
 
 label  dban_ops2
     MENU LABEL dban_ops2:     RCMP TSSIT OPS-II standard wipe.
-    linux /boot/dban/dban.bzi
+    linux /boot/dban/dban-@VERSION@-@ARCH@.bzi
     APPEND nuke="dwipe --autonuke --method ops2" silent vga=785
 
 label  dban_paranoid
     MENU LABEL dban_paranoid: Be really sure.
-    linux /boot/dban/dban.bzi
+    linux /boot/dban/dban-@VERSION@-@ARCH@.bzi
     APPEND nuke="dwipe --autonuke --method prng --rounds 8 --verify all" silent vga=785
 
 label  dban_prng
     MENU LABEL dban_prng:     PRNG stream wipe
-    linux /boot/dban/dban.bzi
+    linux /boot/dban/dban-@VERSION@-@ARCH@.bzi
     APPEND nuke="dwipe --autonuke --method prng --rounds 8" silent vga=785
 
 label  dban_quick
     MENU LABEL dban_quick:    Quick erase
-    linux /boot/dban/dban.bzi
+    linux /boot/dban/dban-@VERSION@-@ARCH@.bzi
     APPEND nuke="dwipe --autonuke --method quick" silent vga=785
 
 label  dban_zero
     MENU LABEL dban_zero:     Quick erase
-    linux /boot/dban/dban.bzi
+    linux /boot/dban/dban-@VERSION@-@ARCH@.bzi
     APPEND nuke="dwipe --autonuke --method zero" silent vga=785
 
 MENU END
diff --git a/src/distros/dban/make.boot b/src/distros/dban/make.boot
index 69e6aa9..2fbd63c 100644
--- a/src/distros/dban/make.boot
+++ b/src/distros/dban/make.boot
@@ -1,5 +1,5 @@
 
-DOWNLOAD_FILES          += $(FILES_DBAN)
+DOWNLOAD_FILES          += boot/dban/dban-@VERSION@-@ARCH@.bzi
 
 
 tmp/boot/dban/dban-@VERSION@_@ARCH@/.iperd-extracted:
@@ -10,7 +10,7 @@ tmp/boot/dban/dban-@VERSION@_@ARCH@/.iperd-extracted:
 	   $(MIRROR_DBAN)/dban-@VERSION@/dban-@VERSION@_@ARCH@.iso
 
 
-boot/dban/dban.bzi: tmp/boot/dban/dban-@VERSION@_@ARCH@/.iperd-extracted
+boot/dban/dban-@VERSION@-@ARCH@.bzi: tmp/boot/dban/dban-@VERSION@_@ARCH@/.iperd-extracted
 	@mkdir -p "$$(dirname "$(@)")"
 	cp tmp/boot/dban/dban-@VERSION@_@ARCH@/dban.bzi "$(@)"
 	@test -f "$(@)" && touch "$(@)"
-- 
cgit v1.2.3