From 575733aa251a0f8fc5e14c86f3e18ee000453917 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 20 Aug 2013 13:08:11 +0200 Subject: [PATCH] add newline to cmdline config files --- modules.d/90crypt/module-setup.sh | 1 + modules.d/90dmraid/module-setup.sh | 1 + modules.d/90lvm/module-setup.sh | 1 + modules.d/90mdraid/module-setup.sh | 1 + modules.d/95rootfs-block/module-setup.sh | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh index 67bc83d6d..185839152 100755 --- a/modules.d/90crypt/module-setup.sh +++ b/modules.d/90crypt/module-setup.sh @@ -47,6 +47,7 @@ cmdline() { install() { cmdline >> "${initdir}/etc/cmdline.d/90crypt.conf" + echo >> "${initdir}/etc/cmdline.d/90crypt.conf" inst_multiple cryptsetup rmdir readlink umount inst_script "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask diff --git a/modules.d/90dmraid/module-setup.sh b/modules.d/90dmraid/module-setup.sh index b93db8f70..2d73963aa 100755 --- a/modules.d/90dmraid/module-setup.sh +++ b/modules.d/90dmraid/module-setup.sh @@ -62,6 +62,7 @@ install() { local _i cmdline >> "${initdir}/etc/cmdline.d/90dmraid.conf" + echo >> "${initdir}/etc/cmdline.d/90dmraid.conf" inst_multiple dmraid inst_multiple -o kpartx diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh index 692503938..2ef9a514a 100755 --- a/modules.d/90lvm/module-setup.sh +++ b/modules.d/90lvm/module-setup.sh @@ -58,6 +58,7 @@ install() { [[ "$(lvs --noheadings -o segtype ${line%%/*} 2>/dev/null)" == *thin* ]] && _needthin=1 fi done >> "${initdir}/etc/cmdline.d/90lvm.conf" + echo >> "${initdir}/etc/cmdline.d/90lvm.conf" inst_rules "$moddir/64-lvm.rules" diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh index 2fe4074d3..2bedbfd7a 100755 --- a/modules.d/90mdraid/module-setup.sh +++ b/modules.d/90mdraid/module-setup.sh @@ -56,6 +56,7 @@ install() { inst $(command -v mdadm) /sbin/mdadm cmdline >> "${initdir}/etc/cmdline.d/90mdraid.conf" + echo >> "${initdir}/etc/cmdline.d/90mdraid.conf" inst_rules 64-md-raid.rules # remove incremental assembly from stock rules, so they don't shadow diff --git a/modules.d/95rootfs-block/module-setup.sh b/modules.d/95rootfs-block/module-setup.sh index 6654b9812..f066a79c0 100755 --- a/modules.d/95rootfs-block/module-setup.sh +++ b/modules.d/95rootfs-block/module-setup.sh @@ -32,7 +32,7 @@ install() { fi if [ -n "$journaldev" ]; then - echo "root.journaldev=$journaldev" >> "${initdir}/etc/cmdline.d/95root-journaldev.conf" + printf "%s\n" "root.journaldev=$journaldev" >> "${initdir}/etc/cmdline.d/95root-journaldev.conf" fi done fi -- 2.47.3