diff options
| author | torben | 2015-11-27 15:30:21 +0100 |
|---|---|---|
| committer | torben | 2015-11-27 15:30:21 +0100 |
| commit | 3505cbbe9e1351e8d0b154e91af7df28f5c0503b (patch) | |
| tree | 3b7c3b69492dc48c0d6e9a836b5ea7f6b8a13305 | |
| parent | Fix. (diff) | |
| download | systemd-init-3505cbbe9e1351e8d0b154e91af7df28f5c0503b.tar.gz systemd-init-3505cbbe9e1351e8d0b154e91af7df28f5c0503b.tar.xz systemd-init-3505cbbe9e1351e8d0b154e91af7df28f5c0503b.zip | |
Fix.
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh | 2 | ||||
| -rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh b/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh index 322b8a76..4a9ddecb 100755 --- a/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh +++ b/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh @@ -1,4 +1,4 @@ -SLX_INITIAL_KERNEL_COMMAND_LINE="$(cat /proc/cmdline)" +SLX_INITIAL_KERNEL_COMMAND_LINE="$(cat /proc/cmdline | tr --delete '\n')" # This location will be used to have a writable kernel command line file # location. diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index dc35ef0c..66d3e40c 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -125,10 +125,10 @@ install() { inst_multiple lsblk ping ip ifconfig sshd htop tail head vim touch sed \ lsmod sleep route wget find lsof strace chroot switch_root pivot_root \ mount fdisk mkfs.xfs env busybox ps agetty \ - insmod qemu-nbd blockdev partx dmsetup sed cut awk insmod qemu-nbd \ + insmod qemu-nbd blockdev partx dmsetup sed cut awk tr insmod qemu-nbd \ blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep \ basename dirname # Production: - # inst_multiple insmod qemu-nbd blockdev partx dmsetup cat cut awk \ + # inst_multiple insmod qemu-nbd blockdev partx dmsetup cat cut awk tr \ # losetup dd mkfs.ext4 grep } |
