diff options
| -rwxr-xr-x | builder/build-initramfs.sh | 3 | ||||
| -rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 19 | ||||
| -rwxr-xr-x | dev-tools/centOSStartup.nsh | 8 | ||||
| -rw-r--r-- | dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default | 8 |
4 files changed, 31 insertions, 7 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index dc820fb3..bb8fe1c9 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -99,7 +99,8 @@ build_initramfs_create_system_image='' build_initramfs_cleanup='no' build_initramfs_use_systemd_in_initramfs='no' build_initramfs_dependencies=(cpio git test shift mktemp cat rm sed gzip curl \ - tar grep make gcc cmake readlink dirname dmsetup chroot qemu-nbd) + tar grep make gcc cmake readlink dirname dmsetup chroot) + ##TODO dependencies to check #xmount: fuse #qemu-xmount: glib-2.0 pixman-1 diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index 9798172f..dcc96766 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -28,12 +28,21 @@ check() { exceptions.activate # NOTE: xmount must be compiled before qemu_xmount - if [[ ! -f "$moddir/binaries/xmount/trunk/build/src/xmount" ]] - then - build_compile_xmount "$moddir/binaries/xmount/" + if [[ ! -f "$moddir/binaries/xmount/trunk/build/src/xmount" ]]; then + if build_compile_xmount "$moddir/binaries/xmount/"; then + local xmount_was_successfull=true + else + local xmount_was_successfull=false + logging.warn \ + "Compiling \"xmount\" fails. So we aren't able to support container files (only raw images)." + fi fi - if [[ ! -f "$moddir/binaries/qemu-xmount/libxmount_input_qemu.so" ]]; then - build_compile_qemu_xmount "$moddir/binaries/qemu-xmount/" + if $xmount_was_successfull && [[ \ + ! -f "$moddir/binaries/qemu-xmount/libxmount_input_qemu.so" \ + ]]; then + build_compile_qemu_xmount "$moddir/binaries/qemu-xmount/" || \ + logging.warn \ + "Compiling \"xmount\" fails. So we aren't able to support container files (only raw images)." fi if [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3.ko" ]] || \ [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]] diff --git a/dev-tools/centOSStartup.nsh b/dev-tools/centOSStartup.nsh new file mode 100755 index 00000000..cc635137 --- /dev/null +++ b/dev-tools/centOSStartup.nsh @@ -0,0 +1,8 @@ +if exist fs0:\debug then + rm fs0:\debug + # remote + # \vmlinuz-linux initrd=\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 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/ BOOTIF=01-08-00-27-87-9f-44 + # local + \vmlinuz-linux root=PARTLABEL=system rw rootflags=subvol=root initrd=\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 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/ BOOTIF=01-08-00-27-87-9f-44 +endif +\vmlinuz-linux initrd=\initramfs-linux.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default index 3ebe77f4..96caf72e 100644 --- a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default +++ b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default @@ -26,7 +26,13 @@ SYSAPPEND 2 LABEL ubuntu MENU LABEL ^ubuntu network boot 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/ +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 centOS +MENU LABEL ^centOS network boot +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 BootNormal |