From 9321eb44e7c29615e115a0fb3e7121e62b189dfa Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Mon, 12 Mar 2018 22:10:40 +0000
Subject: [PATCH] Use true|false instead of y|n for environment variables

Commit 97c0e08bd0f00264eb3c2c5896a28e25a89d9f6f changed from yes|no to
true|false. Maintain this consistency and change newly added
environment variables.
---
 backend/initramfs-tools/live.hook | 17 +++++++++--------
 manpages/en/live-boot.7           | 12 ++++++------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook
index 0e75e4d..5970e7d 100755
--- a/backend/initramfs-tools/live.hook
+++ b/backend/initramfs-tools/live.hook
@@ -53,7 +53,7 @@ do
 done
 
 # udev dependencies
-if [ "${MINIMAL:-}" != "y" ]
+if [ "${MINIMAL:-}" != "true" ] &&  [ "${MINIMAL:-}" != "yes" ]
 then
 	for FILE in /lib/udev/*_id
 	do
@@ -61,7 +61,8 @@ then
 	done
 fi
 
-if [ -e /lib/udev/rules.d/60-cdrom_id.rules ] && [ "${DISABLE_CDROM:-}" != "y" ]
+if [ -e /lib/udev/rules.d/60-cdrom_id.rules ] && [ "${DISABLE_CDROM:-}" != "true" ] && \
+	[ "${DISABLE_CDROM:-}" != "yes" ]
 then
 	mkdir -p "${DESTDIR}/lib/udev/rules.d"
 	cp -p /lib/udev/rules.d/60-cdrom_id.rules "${DESTDIR}/lib/udev/rules.d"
@@ -106,7 +107,7 @@ manual_add_modules hfsplus
 # Filesystem: jffs2
 manual_add_modules jffs2
 
-if [ -x /usr/bin/rsync ] && [ "${MINIMAL:-}" != "y" ]
+if [ -x /usr/bin/rsync ] && [ "${MINIMAL:-}" != "true" ] && [ "${MINIMAL:-}" != "yes" ]
 then
 	copy_exec /usr/bin/rsync /bin
 fi
@@ -123,7 +124,7 @@ manual_add_modules aufs
 manual_add_modules overlay
 
 # Filesystem: vfat
-if [ "${DISABLE_FAT:-}" != "y" ]
+if [ "${DISABLE_FAT:-}" != "true" ] &&  [ "${DISABLE_FAT:-}" != "yes" ]
 then
 	manual_add_modules nls_cp437
 	manual_add_modules nls_iso8859-1
@@ -133,14 +134,14 @@ then
 fi
 
 # Filesystem: ntfs
-if [ "${DISABLE_NTFS:-}" != "y" ]
+if [ "${DISABLE_NTFS:-}" != "true" ] && [ "${DISABLE_NTFS:-}" != "yes" ]
 then
 	manual_add_modules ntfs
 fi
 
 [ "${QUIET}" ] || echo -n " devices"
 # Hardware: cdrom
-if [ "${DISABLE_CDROM:-}" != "y" ]
+if [ "${DISABLE_CDROM:-}" != "true" ] && [ "${DISABLE_CDROM:-}" != "yes" ]
 then
 	manual_add_modules ide-cd
 	manual_add_modules ide-generic
@@ -150,7 +151,7 @@ then
 fi
 
 # Hardware: usb
-if [ "${DISABLE_USB:-}" != "y" ]
+if [ "${DISABLE_USB:-}" != "true" ] && [ "${DISABLE_USB:-}" != "yes" ]
 then
 	manual_add_modules sd_mod
 fi
@@ -198,7 +199,7 @@ then
 fi
 
 # FUSE kernel module
-if [ "${DISABLE_FUSE:-n}" != "y" ]
+if [ "${DISABLE_FUSE:-n}" != "true" ] && [ "${DISABLE_FUSE:-n}" != "yes" ]
 then
 	manual_add_modules fuse
 
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index d49f578..b29143a 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -27,27 +27,27 @@ In addition, there are some more boot parameters to influence the behaviour, see
 These environment variables can only be set in the configuration files:
 
 .TP
-\fBDISABLE_CDROM\fR=[\fIy\fR|\fIn\fR]
+\fBDISABLE_CDROM\fR=[\fItrue\fR|\fIfalse\fR]
 Disable support for booting from CD-ROMs.  If set to '\fIy\fR' mkinitramfs will build an initramfs without the kernel modules for reading CD-ROMs.
 
 .TP
-\fBDISABLE_FAT\fR=[\fIy\fR|\fIn\fR]
+\fBDISABLE_FAT\fR=[\fItrue\fR|\fIfalse\fR]
 Disable support for booting from FAT file systems.  If set to '\fIy\fR' mkinitramfs will build an initramfs without the kernel module vfat and some nls_* modules.
 
 .TP
-\fBDISABLE_FUSE\fR=[\fIy\fR|\fIn\fR]
+\fBDISABLE_FUSE\fR=[\fItrue\fR|\fIfalse\fR]
 Disable support for booting from FUSE-based file systems.  If set to '\fIy\fR' mkinitramfs will build an initramfs without the kernel module fuse and file systems that depend on it (like curlftpfs and httpfs2).
 
 .TP
-\fBDISABLE_NTFS\fR=[\fIy\fR|\fIn\fR]
+\fBDISABLE_NTFS\fR=[\fItrue\fR|\fIfalse\fR]
 Disable support for booting from NTFS file systems.  If set to '\fIy\fR' mkinitramfs will build an initramfs without the kernel module ntfs.
 
 .TP
-\fBDISABLE_USB\fR=[\fIy\fR|\fIn\fR]
+\fBDISABLE_USB\fR=[\fItrue\fR|\fIfalse\fR]
 Disable support for booting from USB devices.  If set to '\fIy\fR' mkinitramfs will build an initramfs without the kernel module sd_mod.
 
 .TP
-\fBMINIMAL\fR=[\fIy\fR|\fIn\fR]
+\fBMINIMAL\fR=[\fItrue\fR|\fIfalse\fR]
 Build a minimal initramfs.  If set to '\fIy\fR' mkinitramfs will build an initramfs without some udev scripts and without rsync.
 
 .TP
-- 
2.1.4