Adabpt pxe menus.

3 files changed, 57 insertions, 28 deletions

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 90a4fe77..71a65526 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -4,7 +4,7 @@
 # region header
 
 # Copyright Torben Sickert (info["~at~"]torben.website) 29.10.2015
-#           Janosch Dobler (TODO) 29.10.2015
+#           Janosch Dobler (info["~at~"]jandob.com) 29.10.2015
 
 # License
 # -------
@@ -283,17 +283,6 @@ function build_initramfs_initialize_dracut() {
     popd
     return $?
 }
-function build_initramfs_create_qcow2_system() {
-    # Packs current distribution in a qcow2 container.
-    #
-    # Examples:
-    #
-    # >>> build_initramfs_create_qcow2_system
-    echo TODO
-    # dmsetup snapshot ...
-    #qemu-img create -f qcow2 "${CONTAINER_PATH}" "${QCOW_SIZE}"
-    return $?
-}
 function build_initramfs_cleanup() {
     # Removes distribution specific generated files.
     #
@@ -315,8 +304,8 @@ function build_initramfs_cleanup() {
 
 ## region dependency checks
 
-utils.dependency_check "${build_initramfs_dependencies[*]}"
-utils_dependency_check_pkgconfig "${build_initramfs_dependencies_pkgconfig[*]}"
+utils.dependency_check ${build_initramfs_dependencies[*]}
+utils_dependency_check_pkgconfig ${build_initramfs_dependencies_pkgconfig[*]}
 # TODO check for existing kernel headers.
 # Find lib locations: $(gcc -print-prog-name=cc1plus) -v
 if ! ldconfig --print-cache | grep libz.so; then
@@ -337,8 +326,14 @@ if [[ "$build_initramfs_target" != '' ]]; then
     build_initramfs__target="$build_initramfs_target"
     if [[ -f "$build_initramfs_target" ]]; then
         build_initramfs__target="$(mktemp --directory)"
-        # TODO
-        #qemu-nbd "$build_initramfs_target" "$build_initramfs__target"
+        build_initramfs__xmount_mountpoint_target="$(mktemp --directory)"
+        xmount --in qemu "$build_initramfs_target" --out raw \
+            "$build_initramfs__xmount_mountpoint_target"
+        build_initramfs__xmount_device_target="$(losetup --find)"
+        losetup "$build_initramfs__xmount_device_target" loopdev \
+            "${build_initramfs__xmount_mountpoint_target}/"*.dd
+        mount "$build_initramfs__xmount_device_target" \
+            "$build_initramfs__target"
     fi
     if [[ -d "$build_initramfs__target" ]]; then
         build_initramfs__temporary_working_directory="$(chroot \
diff --git a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default
index 80a02627..6b895477 100755
--- a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default
+++ b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default
@@ -51,15 +51,22 @@ 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 ^archLinux Torben
+   KERNEL http://132.230.4.201:8080/archLinux/vmlinuz-linux
+   INITRD http://132.230.4.201:8080/archLinux/initramfs-test.img
+   APPEND loglevel=2 acpi_osi="!Windows 2012" rd.info vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.201:8080 slxbase=archLinux/
+   SYSAPPEND 2
+   IPAPPEND 3
+   MENU DEFAULT
 
 LABEL net
-   MENU LABEL ^Dracut TEST Torben
+   MENU LABEL ^archLinux Torben Debug
    KERNEL http://132.230.4.201:8080/archLinux/vmlinuz-linux
    INITRD http://132.230.4.201:8080/archLinux/initramfs-test.img
    APPEND loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.201:8080 slxbase=archLinux/
@@ -68,9 +75,36 @@ LABEL net
    MENU DEFAULT
 
 LABEL net
-   MENU LABEL ^Dracut TEST Janosch
-   KERNEL http://132.230.4.202:8080/archLinux/archLinux-vmlinuz-linux
-   INITRD http://132.230.4.202:8080/archLinux/archLinux-initramfs-test.img
+   MENU LABEL ^archLinux Torben serial debug
+   KERNEL http://132.230.4.201:8080/archLinux/vmlinuz-linux
+   INITRD http://132.230.4.201:8080/archLinux/initramfs-test.img
+   APPEND loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.201:8080 slxbase=archLinux/ systemd.journald.forward_to_console=1 console=tty0 console=ttyS0,128000
+   SYSAPPEND 2
+   IPAPPEND 3
+   MENU DEFAULT
+
+LABEL net
+   MENU LABEL ^ubuntu Torben
+   KERNEL http://132.230.4.201:8080/ubuntu/vmlinuz-linux
+   INITRD http://132.230.4.201:8080/ubuntu/initramfs-test.img
+   APPEND loglevel=2 acpi_osi="!Windows 2012" rd.info vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.201:8080 slxbase=ubuntu/
+   SYSAPPEND 2
+   IPAPPEND 3
+   MENU DEFAULT
+
+LABEL net
+   MENU LABEL ^ubuntu Torben debug
+   KERNEL http://132.230.4.201:8080/ubuntu/vmlinuz-linux
+   INITRD http://132.230.4.201:8080/ubuntu/initramfs-test.img
+   APPEND loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.201:8080 slxbase=ubuntu/
+   SYSAPPEND 2
+   IPAPPEND 3
+   MENU DEFAULT
+
+LABEL net
+   MENU LABEL ^archLinux Janosch
+   KERNEL http://132.230.4.202:8080/archLinux/vmlinuz-linux
+   INITRD http://132.230.4.202:8080/archLinux/initramfs-test.img
    APPEND initrd=/archLinux-initramfs-test.img loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.202:8080 slxbase=archLinux/
    SYSAPPEND 2
    IPAPPEND 3
diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default
index df85eacb..31011d44 100644
--- a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default
+++ b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default
@@ -6,43 +6,43 @@ PROMPT 0
 MENU TITLE Janosch und Torbens Bastelspassmenu
 
 LABEL arch
-MENU LABEL ^arch network boot
+MENU LABEL ^archLinux
 KERNEL /archLinux-vmlinuz-linux
 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
-MENU LABEL ^arch network boot debug
+MENU LABEL ^archLinux
 KERNEL /archLinux-vmlinuz-linux
 APPEND initrd=/archLinux-initramfs-test.img loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16 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/ systemd.log_level=info systemd.journald.forward_to_console=1
 SYSAPPEND 2
 
 LABEL arch
-MENU LABEL ^arch network boot serial debug
+MENU LABEL ^archlinux
 KERNEL /archLinux-vmlinuz-linux
 APPEND initrd=/archLinux-initramfs-test.img loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16 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/ systemd.log_level=info systemd.journald.forward_to_console=1 console=tty0 console=ttyS0,128000
 SYSAPPEND 2
 
 LABEL ubuntu
-MENU LABEL ^ubuntu network boot
+MENU LABEL ^ubuntu
 KERNEL /ubuntu-vmlinuz-linux
 APPEND initrd=/ubuntu-initramfs-test.img loglevel=2 acpi_osi="!Windows 2012" rd.info ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16  vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 net.ifnames=1 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=ubuntu/
 SYSAPPEND 2
 
 LABEL ubuntu
-MENU LABEL ^ubuntu network boot debug
+MENU LABEL ^ubuntu debug
 KERNEL /ubuntu-vmlinuz-linux
 APPEND initrd=/ubuntu-initramfs-test.img loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16  vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 net.ifnames=1 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=ubuntu/
 SYSAPPEND 2
 
 LABEL centOS
-MENU LABEL ^centOS network boot
+MENU LABEL ^centOS
 KERNEL /centOS-vmlinuz-linux
 APPEND initrd=/centOS-initramfs-test.img loglevel=2 acpi_osi="!Windows 2012" rd.info ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16  vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 net.ifnames=1 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=centOS/
 SYSAPPEND 2
 
 LABEL centOS
-MENU LABEL ^centOS network boot debug
+MENU LABEL ^centOS debug
 KERNEL /centOS-vmlinuz-linux
 APPEND initrd=/centOS-initramfs-test.img loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16  vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 net.ifnames=1 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=centOS/
 SYSAPPEND 2