defaults: ensure labels have defaults for derivatives

2 files changed, 5 insertions, 17 deletions

diff --git a/functions/defaults.sh b/functions/defaults.sh
index fd9129ed5..391f65474 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -477,11 +477,7 @@ Set_config_defaults ()
 	LB_BOOTAPPEND_INSTALL="$(echo ${LB_BOOTAPPEND_INSTALL} | sed -e 's/[ \t]*$//')"
 
 	# Setting iso author
-	case "${LB_MODE}" in
-		debian)
-			LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Debian Live}"
-			;;
-	esac
+	LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Debian Live}"
 
 	# Set iso preparer
 	LB_ISO_PREPARER="${LB_ISO_PREPARER:-live-build \$VERSION; https://salsa.debian.org/live-team/live-build}"
@@ -490,21 +486,13 @@ Set_config_defaults ()
 	LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER:-Debian Live project; https://wiki.debian.org/DebianLive; debian-live@lists.debian.org}"
 
 	# Setting hdd options
-	case "${LB_MODE}" in
-		debian)
-			LB_HDD_LABEL="${LB_HDD_LABEL:-DEBIAN_LIVE}"
-			;;
-	esac
+	LB_HDD_LABEL="${LB_HDD_LABEL:-DEBIAN_LIVE}"
 
 	# Setting hdd size
 	LB_HDD_SIZE="${LB_HDD_SIZE:-auto}"
 
 	# Setting iso volume
-	case "${LB_MODE}" in
-		debian)
-			LB_ISO_VOLUME="${LB_ISO_VOLUME:-Debian ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}"
-			;;
-	esac
+	LB_ISO_VOLUME="${LB_ISO_VOLUME:-Debian ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}"
 
 	# Setting memtest option
 	LB_MEMTEST="${LB_MEMTEST:-none}"
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 614ce565b..95e28b606 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -372,13 +372,13 @@ defines the init system. Defaults to systemd.
 .IP "\fB\-\-interactive\fR shell" 4
 defines if after the chroot stage and before the beginning of the binary stage, a interactive shell login should be spawned in the chroot in order to allow you to do manual customizations. Once you close the shell with logout or exit, the build will continue as usual. Note that it's strongly discouraged to use this for anything else than testing. Modifications that should be present in all builds of a live system should be properly made through hooks. Everything else destroys the beauty of being able to completely automate the build process and making it non-interactive. By default, this is of course false.
 .IP "\fB\-\-iso\-application\fR \fINAME\fR" 4
-sets the APPLICATION field in the header of a resulting CD/DVD image and defaults to "Debian Live" in debian mode.
+sets the APPLICATION field in the header of a resulting CD/DVD image and defaults to "Debian Live".
 .IP "\fB\-\-iso\-preparer\fR \fINAME\fR" 4
 sets the PREPARER field in the header of a resulting CD/DVD image. By default this is set to "live\-build \fIVERSION\fR; https://salsa.debian.org/live-team/live-build", where VERSION is expanded to the version of live\-build that was used to build the image.
 .IP "\fB\-\-iso\-publisher\fR \fINAME\fR" 4
 sets the PUBLISHED field in the header of a resulting CD/DVD image. By default, this is set to 'Debian Live project; https://wiki.debian.org/DebianLive; debian\-live@lists.debian.org'. Remember to change this to the appropriate value when distributing custom and unofficial images.
 .IP "\fB\-\-iso\-volume\fR \fINAME\fR" 4
-sets the VOLUME field in the header of a resulting CD/DVD and defaults to '(\fIMODE\fR) (\fIDISTRIBUTION\fR) (\fIDATE\fR)' whereas MODE is expanded to the name of the mode in use, DISTRIBUTION the distribution name, and DATE with the current date and time of the generation.
+sets the VOLUME field in the header of a resulting CD/DVD and defaults to 'Debian (\fIDISTRIBUTION\fR) (\fIDATE\fR)' whereas DISTRIBUTION the distribution name, and DATE with the current date and time of the generation.
 .IP "\fB\-\-isohybrid\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4
 defines options to pass to isohybrid.
 .IP "\fB\-\-jffs2\-eraseblock\fR \fISIZE\fR" 4