Merge commit 'a86c1f8e0fd2546f27f6fc607b5d77613c23e73a'

1995parham · Sep 8, 2023 · 25a8308 · 25a8308
2 parents a0a0e61 + a86c1f8
commit 25a8308
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/scripts/lib/require.sh b/scripts/lib/require.sh
@@ -264,8 +264,10 @@ function require_systemd_kernel_parameter() {
 	local new_kernel_parameter=${1:?"new parameter required"}
 
 	for configuration in /boot/loader/entries/*.conf; do
+		echo
 		message 'systemd-boot' "updating $configuration"
-		message 'systemd-boot' "$(grep kernel_parameters "$configuration")"
+		echo
+		message 'systemd-boot' "$(grep options "$configuration")"
 
 		case "$new_kernel_parameter" in
 		+*)
@@ -279,7 +281,9 @@ function require_systemd_kernel_parameter() {
 			;;
 		esac
 
-		message 'systemd-boot' "$(grep kernel_parameters "$configuration")"
+		message 'systemd-boot' "$(grep options "$configuration")"
+		echo
+		echo
 	done
 }
 
@@ -289,7 +293,7 @@ function _add_systemd_kernel_parameter() {
 
 	local kernel_paramters
 	declare -a kernel_paramters
-	IFS=' ' read -ra kernel_paramters <<<"$(grep kernel_paramters "$configuration")"
+	IFS=' ' read -ra kernel_paramters <<<"$(grep options "$configuration")"
 
 	local output
 	output=$(echo -n "current kernel_paramters: |")
@@ -304,7 +308,7 @@ function _add_systemd_kernel_parameter() {
 	done
 	kernel_paramters+=("$new_kernel_parameter")
 
-	sudo sed -i -e "s|^kernel_paramters.*$|${kernel_paramters[*]}|" "$configuration"
+	sudo sed -i -e "s|^options.*$|${kernel_paramters[*]}|" "$configuration"
 }
 
 function _remove_systemd_kernel_parameter() {
@@ -313,7 +317,7 @@ function _remove_systemd_kernel_parameter() {
 
 	local kernel_paramters
 	declare -a kernel_paramters
-	IFS=' ' read -ra kernel_paramters <<<"$(grep kernel_paramters "$configuration")"
+	IFS=' ' read -ra kernel_paramters <<<"$(grep options "$configuration")"
 
 	local output
 	output=$(echo -n "current kernel_paramters: |")
@@ -329,6 +333,6 @@ function _remove_systemd_kernel_parameter() {
 	done
 
 	if [ "$found" -eq 1 ]; then
-		sudo sed -i -e "s|^kernel_paramters.*$|${kernel_paramters[*]}|" "$configuration"
+		sudo sed -i -e "s|^options.*$|${kernel_paramters[*]}|" "$configuration"
 	fi
 }