diff options
| author | torben | 2015-11-13 11:56:45 +0100 |
|---|---|---|
| committer | torben | 2015-11-13 11:56:45 +0100 |
| commit | 510e024f21cd38ab87c0ffa25291eacd996955f3 (patch) | |
| tree | 5dd31ee024b934f2a4b1a9d7fc30d9677adf8e2b /builder | |
| parent | Removes deprecated files. (diff) | |
| download | systemd-init-510e024f21cd38ab87c0ffa25291eacd996955f3.tar.gz systemd-init-510e024f21cd38ab87c0ffa25291eacd996955f3.tar.xz systemd-init-510e024f21cd38ab87c0ffa25291eacd996955f3.zip | |
Sync.
Diffstat (limited to 'builder')
| -rwxr-xr-x | builder/build-initramfs.sh | 3 | ||||
| -rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index 4d9d64a4..be1c57ca 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -254,7 +254,8 @@ EOF if [ "$_DEBUG" == 'yes' ]; then loglevel="$loglevel --stdlog 4" fi - dracut/dracut.sh --local $loglevel --force --modules "dnbd3-rootfs" \ + # TODO load i18n if debug flag is set. + dracut/dracut.sh --local $loglevel --force --modules "dnbd3-rootfs i18n" \ --no-hostonly /boot/initramfs-test.img \ 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" fi diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index 907b5cee..0958544b 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -89,13 +89,15 @@ install() { # Udev rules detecting 44, 45, 46 partitions and running # "prepare-persistent-disks" to prepare persistent partitions. inst "$moddir/udev/70-openslx-disk.rules" /etc/udev/rules.d/70-openslx-disk.rules + # Use terminal readline settings from the template system. + inst /etc/inputrc /etc/inputrc # endregion # Debugging: 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 \ + mount fdisk mkfs.xfs env busybox ps getty \ insmod qemu-nbd blockdev partx dmsetup sed cut awk insmod qemu-nbd \ blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep # Production: |