summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorben2015-11-13 11:56:45 +0100
committertorben2015-11-13 11:56:45 +0100
commit510e024f21cd38ab87c0ffa25291eacd996955f3 (patch)
tree5dd31ee024b934f2a4b1a9d7fc30d9677adf8e2b
parentRemoves deprecated files. (diff)
downloadsystemd-init-510e024f21cd38ab87c0ffa25291eacd996955f3.tar.gz
systemd-init-510e024f21cd38ab87c0ffa25291eacd996955f3.tar.xz
systemd-init-510e024f21cd38ab87c0ffa25291eacd996955f3.zip
Sync.
-rwxr-xr-xbuilder/build-initramfs.sh3
-rwxr-xr-xbuilder/dnbd3-rootfs/module-setup.sh4
-rw-r--r--dev-tools/ipxelinux.0.torbenbin0 -> 90476 bytes
-rw-r--r--dev-tools/tftp/openslx.pngbin0 -> 77561 bytes
-rw-r--r--dev-tools/tftp/pxechain.combin0 -> 998 bytes
-rw-r--r--dev-tools/tftp/pxelinux.cfg/default70
-rwxr-xr-xdev-tools/tftp/vesamenu.c32bin0 -> 155792 bytes
7 files changed, 75 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:
diff --git a/dev-tools/ipxelinux.0.torben b/dev-tools/ipxelinux.0.torben
new file mode 100644
index 00000000..3c772236
--- /dev/null
+++ b/dev-tools/ipxelinux.0.torben
Binary files differ
diff --git a/dev-tools/tftp/openslx.png b/dev-tools/tftp/openslx.png
new file mode 100644
index 00000000..1889edb7
--- /dev/null
+++ b/dev-tools/tftp/openslx.png
Binary files differ
diff --git a/dev-tools/tftp/pxechain.com b/dev-tools/tftp/pxechain.com
new file mode 100644
index 00000000..8c4e0c5b
--- /dev/null
+++ b/dev-tools/tftp/pxechain.com
Binary files differ
diff --git a/dev-tools/tftp/pxelinux.cfg/default b/dev-tools/tftp/pxelinux.cfg/default
new file mode 100644
index 00000000..2a0e4cc0
--- /dev/null
+++ b/dev-tools/tftp/pxelinux.cfg/default
@@ -0,0 +1,70 @@
+DEFAULT vesamenu.c32
+
+NOESCAPE 1
+PROMPT 0
+MENU MASTER PASSWD $6$ZF6CQg1WsYRol8VB$BPMPN32qsihjciRbCjCDCFC3tkHoRaZygpR/t7ihjT0YYW1vyrNOUazflIaDAZXbzaTfnDPIYqfFDYKtUdh620
+
+MENU BACKGROUND openslx.png
+MENU WIDTH 78
+MENU MARGIN 9
+MENU PASSWORDMARGIN 9
+MENU ROWS 10
+MENU TABMSGROW 16
+MENU CMDLINEROW 16
+MENU ENDROW -1
+MENU PASSWORDROW 16
+MENU TIMEOUTROW 20
+MENU HELPMSGROW 16
+MENU HELPMSGENDROW -1
+MENU HSHIFT 0
+MENU VSHIFT 7
+
+menu color screen 37;40 #80000000 #00000000 std
+menu color border 37;40 #40000000 #ff757575 std
+menu color title 1;37;40 #ffff8b00 #ff757575 std
+menu color unsel 37;40 #ffffffff #ff757575 std
+menu color hotkey 1;37;40 #ffff8b00 #ff757575 std
+menu color disabled 1;37;40 #ffff8b00 #ff757575 std
+menu color tabmsg 37;40 #ffff8b00 #ff757575 std
+menu color cmdmark 1;37;40 #ffff8b00 #ff757575 std
+menu color cmdline 37;40 #fff0f0f0 #ff757575 std
+menu color pwdborder 37;40 #40000000 #ff757575 std
+menu color pwdheader 37;40 #ffff8b00 #ff757575 std
+menu color pwdentry 37;40 #ffff8b00 #ff757575 std
+menu color timeout_msg 37;40 #fff0f0f0 #ff757575 std
+menu color timeout 1;37;40 #ffff8b00 #ff757575 std
+menu color sel 7;37;40 #ff000000 #ffcccccc all
+menu color hotsel 1;7;37;40 #ffff8b00 #ffcccccc all
+menu color scrollbar 37;40 #40000000 #ff000000 std
+menu color help 37;40 #ff1c2a33 #00000000 none
+MENU MSGCOLOR #ff1c2a33 #00000000 none
+
+# !! The template is UTF-8, conversion to codepage 437 is done by the taskmanager !!
+
+TIMEOUT 100
+TOTALTIMEOUT 400
+
+MENU TITLE bwLehrpool Bootmen
+MENU AUTOBOOT Automatischer Boot in # Sekunde{,n}
+MENU PASSPROMPT Passwort ben”tigt
+
+MENU CLEAR
+ONTIMEOUT net
+
+
+LABEL shutdown
+ MENU HIDE
+ KERNEL kernel-shutdown
+ APPEND initrd=initramfs-shutdown quiet
+
+
+LABEL net
+ MENU LABEL ^Dracut TEST
+ KERNEL http://132.230.8.199/boot/default/kernel
+ INITRD http://132.230.8.199/boot/default/initramfs-stage31
+ APPEND slxbase=boot/default vga=current quiet splash
+ IPAPPEND 3
+ MENU DEFAULT
+
+
+
diff --git a/dev-tools/tftp/vesamenu.c32 b/dev-tools/tftp/vesamenu.c32
new file mode 100755
index 00000000..06119cd2
--- /dev/null
+++ b/dev-tools/tftp/vesamenu.c32
Binary files differ