diff options
| author | jandob | 2016-03-11 17:10:16 +0100 |
|---|---|---|
| committer | jandob | 2016-03-11 17:10:16 +0100 |
| commit | f4027e371fbf06cf9190ca2fddbf793cddb7c997 (patch) | |
| tree | 28096d48db578010ef7a4fbdf34955f9aa020008 | |
| parent | fix typo (diff) | |
| parent | Fix tftp server config. (diff) | |
| download | systemd-init-f4027e371fbf06cf9190ca2fddbf793cddb7c997.tar.gz systemd-init-f4027e371fbf06cf9190ca2fddbf793cddb7c997.tar.xz systemd-init-f4027e371fbf06cf9190ca2fddbf793cddb7c997.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init
| m--------- | builder/dnbd3-rootfs/scripts/rebash | 0 | ||||
| -rw-r--r-- | dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash -Subproject 1f3b1e1e90e8017bef7460810be9c6e37bbe434 +Subproject 3490cddbb9fbdc020d4822e957224fb5d687552 diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default index 5133203a..80014ee7 100644 --- a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default +++ b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default @@ -8,7 +8,7 @@ MENU TITLE Janosch und Torbens Bastelspassmenu LABEL arch MENU LABEL ^archLinux KERNEL /archLinux-vmlinuz-linux -APPEND initrd=/initramfs-test.img acpi_osi="!Windows 2012" ip=10.0.2.15::10.0.2.2:255.255.255.0 slxsrv=10.0.2.2:80,10.0.2.2:8080,10.0.2.2:8008,10.0.2.2:8090,10.0.2.2:8280,10.0.2.2:8888 slxbase=archLinux/ +APPEND initrd=/archLinux-initramfs-test.img acpi_osi="!Windows 2012" ip=10.0.2.15::10.0.2.2:255.255.255.0 slxsrv=10.0.2.2:80,10.0.2.2:8080,10.0.2.2:8008,10.0.2.2:8090,10.0.2.2:8280,10.0.2.2:8888 slxbase=archLinux/ SYSAPPEND 2 LABEL arch |