build-initramfs.sh: cleanup default params for dracut

1 files changed, 15 insertions, 11 deletions

diff --git a/build-initramfs.sh b/build-initramfs.sh
index a4ad3576..806bbc66 100755
--- a/build-initramfs.sh
+++ b/build-initramfs.sh
@@ -23,13 +23,10 @@ declare -rg _root_dir="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")"
 
 # TODO clean these up
 file_path='/boot/initramfs.img'
-dracut_parameter=(--force --no-hostonly)
 verbose='no'
 debug='no'
-target=''
 cleanup='no'
 full_cleanup='no'
-use_systemd_in_initramfs='no'
 
 declare -rg _repo_dir="${_root_dir}/systemd-init"
 declare -rg _dracut_dir="${_root_dir}/dracut"
@@ -474,18 +471,25 @@ main() {
 		fi
 	done
 
-	# default dracut modules
-	_modules=(dnbd3-rootfs conf-tgz)
-	echo "Default modules: ${_modules[*]}"
+	# default dracut parameters and modules
+	dracut_parameter=(
+		--force
+		--no-hostonly
+	)
+	dracut_modules=(
+		dnbd3-rootfs
+		conf-tgz
+		systemd
+		systemd-initrd
+		dracut-systemd
+	)
+	echo "Default modules: ${dracut_modules[*]}"
 	if [ "$verbose" = "yes" ]; then
 		dracut_parameters+=("--verbose")
 	fi
 	if [ "$debug" = "yes" ]; then
 		dracut_parameters+=("--stdlog" "4")
-		_modules+=(i18n terminfo)
-	fi
-	if [ "$use_systemd_in_initramfs" = "yes" ]; then
-		_modules+=(systemd systemd-initrd dracut-systemd)
+		dracut_modules+=(i18n terminfo)
 	fi
 
 	# Initialize and exit if we are only preparing the build environment
@@ -501,7 +505,7 @@ main() {
 
 	echo 'Building initramfs...'
 	"${_dracut_dir}/dracut.sh" --local \
-		--modules "${_modules[*]}" --conf /etc/dracut.conf \
+		--modules "${dracut_modules[*]}" --conf /etc/dracut.conf \
 		--confdir /etc/dracut.conf.d "${dracut_parameter[@]}" \
 		--kver "${kernel_version}" "$file_path"
 	_return_code=$?