From 5bd4f8a831467d18573233f789f769507c63fb1e Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 25 May 2020 12:45:24 +0200 Subject: cleanup dev-tools/ --- dev-tools/archLinuxStartup.nsh | 8 - dev-tools/build_ipxe_archlinux.patch | 13 -- dev-tools/centOSStartup.nsh | 8 - dev-tools/openslxTFTPRoot/.gitignore | 1 - dev-tools/openslxTFTPRoot/ipxelinux.0.janosch | Bin 90478 -> 0 bytes dev-tools/openslxTFTPRoot/ipxelinux.0.torben | Bin 90476 -> 0 bytes dev-tools/openslxTFTPRoot/openslx.png | Bin 77561 -> 0 bytes dev-tools/openslxTFTPRoot/pxechain.com | Bin 998 -> 0 bytes dev-tools/openslxTFTPRoot/pxelinux.cfg/default | 133 -------------- dev-tools/openslxTFTPRoot/vesamenu.c32 | Bin 155792 -> 0 bytes dev-tools/prepare-persistent-disks | 211 ---------------------- dev-tools/snippets.sh | 113 ------------ dev-tools/ubuntuStartup.nsh | 1 - dev-tools/virtualBoxTFTPRoot/.gitignore | 2 - dev-tools/virtualBoxTFTPRoot/README.md | 16 -- dev-tools/virtualBoxTFTPRoot/ldlinux.c32 | Bin 122308 -> 0 bytes dev-tools/virtualBoxTFTPRoot/libutil.c32 | Bin 24148 -> 0 bytes dev-tools/virtualBoxTFTPRoot/memdisk | Bin 26140 -> 0 bytes dev-tools/virtualBoxTFTPRoot/menu.c32 | Bin 26596 -> 0 bytes dev-tools/virtualBoxTFTPRoot/pxeTest.pxe | Bin 46909 -> 0 bytes dev-tools/virtualBoxTFTPRoot/pxelinux.0 | Bin 46909 -> 0 bytes dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default | 52 ------ 22 files changed, 558 deletions(-) delete mode 100755 dev-tools/archLinuxStartup.nsh delete mode 100644 dev-tools/build_ipxe_archlinux.patch delete mode 100755 dev-tools/centOSStartup.nsh delete mode 100755 dev-tools/openslxTFTPRoot/.gitignore delete mode 100755 dev-tools/openslxTFTPRoot/ipxelinux.0.janosch delete mode 100755 dev-tools/openslxTFTPRoot/ipxelinux.0.torben delete mode 100755 dev-tools/openslxTFTPRoot/openslx.png delete mode 100755 dev-tools/openslxTFTPRoot/pxechain.com delete mode 100755 dev-tools/openslxTFTPRoot/pxelinux.cfg/default delete mode 100755 dev-tools/openslxTFTPRoot/vesamenu.c32 delete mode 100755 dev-tools/prepare-persistent-disks delete mode 100644 dev-tools/snippets.sh delete mode 100755 dev-tools/ubuntuStartup.nsh delete mode 100644 dev-tools/virtualBoxTFTPRoot/.gitignore delete mode 100644 dev-tools/virtualBoxTFTPRoot/README.md delete mode 100755 dev-tools/virtualBoxTFTPRoot/ldlinux.c32 delete mode 100755 dev-tools/virtualBoxTFTPRoot/libutil.c32 delete mode 100644 dev-tools/virtualBoxTFTPRoot/memdisk delete mode 100755 dev-tools/virtualBoxTFTPRoot/menu.c32 delete mode 100644 dev-tools/virtualBoxTFTPRoot/pxeTest.pxe delete mode 100644 dev-tools/virtualBoxTFTPRoot/pxelinux.0 delete mode 100644 dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default (limited to 'dev-tools') diff --git a/dev-tools/archLinuxStartup.nsh b/dev-tools/archLinuxStartup.nsh deleted file mode 100755 index cc635137..00000000 --- a/dev-tools/archLinuxStartup.nsh +++ /dev/null @@ -1,8 +0,0 @@ -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/build_ipxe_archlinux.patch b/dev-tools/build_ipxe_archlinux.patch deleted file mode 100644 index 910243b0..00000000 --- a/dev-tools/build_ipxe_archlinux.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping -index 1b6f092..c0ca3c5 100644 ---- a/src/Makefile.housekeeping -+++ b/src/Makefile.housekeeping -@@ -1301,7 +1301,7 @@ CLEANUP += $(ZBIN) - ELF2EFI_CFLAGS := -I$(BINUTILS_DIR)/include -I$(BFD_DIR)/include \ - -I$(ZLIB_DIR)/include -idirafter include - ELF2EFI_LDFLAGS := -L$(BINUTILS_DIR)/lib -L$(BFD_DIR)/lib -L$(ZLIB_DIR)/lib \ -- -lbfd -ldl -lz -Wl,--no-warn-search-mismatch -+ -lbfd -liberty -ldl -lz -Wl,--no-warn-search-mismatch - - $(ELF2EFI32) : util/elf2efi.c $(MAKEDEPS) - $(QM)$(ECHO) " [HOSTCC] $@" diff --git a/dev-tools/centOSStartup.nsh b/dev-tools/centOSStartup.nsh deleted file mode 100755 index cc635137..00000000 --- a/dev-tools/centOSStartup.nsh +++ /dev/null @@ -1,8 +0,0 @@ -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/openslxTFTPRoot/.gitignore b/dev-tools/openslxTFTPRoot/.gitignore deleted file mode 100755 index 0be1aed5..00000000 --- a/dev-tools/openslxTFTPRoot/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ipxelinux.0 diff --git a/dev-tools/openslxTFTPRoot/ipxelinux.0.janosch b/dev-tools/openslxTFTPRoot/ipxelinux.0.janosch deleted file mode 100755 index aba5e457..00000000 Binary files a/dev-tools/openslxTFTPRoot/ipxelinux.0.janosch and /dev/null differ diff --git a/dev-tools/openslxTFTPRoot/ipxelinux.0.torben b/dev-tools/openslxTFTPRoot/ipxelinux.0.torben deleted file mode 100755 index 3c772236..00000000 Binary files a/dev-tools/openslxTFTPRoot/ipxelinux.0.torben and /dev/null differ diff --git a/dev-tools/openslxTFTPRoot/openslx.png b/dev-tools/openslxTFTPRoot/openslx.png deleted file mode 100755 index 1889edb7..00000000 Binary files a/dev-tools/openslxTFTPRoot/openslx.png and /dev/null differ diff --git a/dev-tools/openslxTFTPRoot/pxechain.com b/dev-tools/openslxTFTPRoot/pxechain.com deleted file mode 100755 index 8c4e0c5b..00000000 Binary files a/dev-tools/openslxTFTPRoot/pxechain.com and /dev/null differ diff --git a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default deleted file mode 100755 index 73b71082..00000000 --- a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default +++ /dev/null @@ -1,133 +0,0 @@ -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 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 ^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 rd.break=pre-shutdown 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 ^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 rd.break=pre-shutdown 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 rd.break=pre-shutdown vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.201:8080 slxbase=ubuntu/ brd.rd_size=2097152 - SYSAPPEND 2 - IPAPPEND 3 - MENU DEFAULT - -LABEL net - MENU LABEL ^centOS Torben - KERNEL http://132.230.4.201:8080/centOS/vmlinuz-linux - INITRD http://132.230.4.201:8080/centOS/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=centOS/ - SYSAPPEND 2 - IPAPPEND 3 - MENU DEFAULT - -LABEL net - MENU LABEL ^centOS Torben debug - KERNEL http://132.230.4.201:8080/centOS/vmlinuz-linux - INITRD http://132.230.4.201:8080/centOS/initramfs-test.img - APPEND loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break rd.break=pre-shutdown vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.201:8080 slxbase=centOS/ - 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 - MENU DEFAULT - -LABEL net - MENU LABEL ^archLinux Janosch debug - 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 rd.break=pre-shutdown vconsole.font=latarcyrheb-sun16 slxsrv=132.230.4.202:8080 slxbase=archLinux/ systemd.log_level=info systemd.journald.forward_to_console=1 - SYSAPPEND 2 - IPAPPEND 3 - MENU DEFAULT diff --git a/dev-tools/openslxTFTPRoot/vesamenu.c32 b/dev-tools/openslxTFTPRoot/vesamenu.c32 deleted file mode 100755 index 06119cd2..00000000 Binary files a/dev-tools/openslxTFTPRoot/vesamenu.c32 and /dev/null differ diff --git a/dev-tools/prepare-persistent-disks b/dev-tools/prepare-persistent-disks deleted file mode 100755 index 2e68dd9e..00000000 --- a/dev-tools/prepare-persistent-disks +++ /dev/null @@ -1,211 +0,0 @@ -#!/bin/bash -############################################################################### -# GLOBALS -# - -# flag file containing pids of running instances for concurrency checks -declare -rg OPENSLX_DISK_FLAG="/tmp/openslx.disk" -# file that will contain the name of the device used for the /tmp partition -# - label 'OPENSLX_TMP' in GPT / type '0x44' in MBR -declare -rg OPENSLX_TMP_MARKER="/tmp/openslx.disk.tmp" -# file that will contain the name of the device used for storing qcow2 -# - label 'OPENSLX_SYS' in GPT / type '0x46' in MBR -declare -rg OPENSLX_SYS_MARKER="/tmp/openslx.disk.sys" -# mount point for system partition -declare -rg OPENSLX_SYS_MOUNT="/opt/openslx/system" - -# -# END GLOBALS -############################################################################### - -############################################################################### -# FUNCTION DEFINITIONS -# -# helper to mount the OPENSLX_SYS partition to /opt/openslx/system -# Usage: mount_sys_part -mount_sys_part() { - if [ ! -b "$1" ]; then - warn "($$) Refusing to mount '$1' as its not a block device!" - return 1 - fi - - local OPENSLX_SYS_DEVICE="$1" - mkdir -p ${OPENSLX_SYS_MOUNT} - if ! mount -t auto "${OPENSLX_SYS_DEVICE}" "${OPENSLX_SYS_MOUNT}"; then - warn "($$) Mounting '${OPENSLX_SYS_DEVICE}' to '${OPENSLX_SYS_MOUNT}' failed." - return 1 - fi - return 0 - -} -# -# generic helper to format the given partition with the given filesystem or -# from the prefdefined list of xfs, ext4, ... -# Usage: format_disk -# e.g. format_disk /dev/sda1 xfs -format_disk () { - local TARGET_DEVICE="$1" - local fslist="xfs ext4" - # if we have a second arguments, its the filesystem of choice - local fs - [ $# -ge 2 ] && fslist="$2" - for fs in $fslist ; do - unset found - local MKFS="$(busybox which mkfs.$fs)" - if [ -n $MKFS ]; then - found=yes - case "mkfs.$fs" in - mkfs.xfs) fopt="-fq" ;; - mkfs.ext4) fopt="-Fq" ;; - esac - info "($$) Formatting $TARGET_DEVICE as $fs" - return $(${MKFS} ${fopt} "${TARGET_DEVICE}") - fi - [ -n "$found" ] && break - done - # still here? then we didn't find a proper formatter... - warn "($$) Could not format $PART_DEV as $fs." - return 1 -} - -# -# END FUNCTION DEFINITIONS -############################################################################### - -############################################################################### -# MAIN CODE -# - -command -v warn >/dev/null || . /lib/dracut-lib.sh - -# let check the arguments -if [ "$#" -ne 2 ]; then - warn "($$) '$0' need 2 arguments: '$0 [OPENSLX_SYS|OPENSLX_TMP] '" - exit 1 -fi -# $1 sane? -if [ "x$1" != "xOPENSLX_SYS" ] && [ "x$1" != "xOPENSLX_TMP" ]; then - warn "($$) First arg needs to be either 'OPENSLX_SYS' or 'OPENSLX_TMP', given: $1" - exit 1 -fi -# $2 sane? -if [ ! -b "/dev/$2" ]; then - warn "($$) Second arg appears not to be a block device!" - exit 1 -fi - -# ok all seems well, set the arguments -PART_TYPE="$1" -PART_DEV="/dev/$2" - -unset OPENSLX_TMP_DEVICE -unset OPENSLX_SYS_DEVICE - -# lets check if we are already running -INSTANCES="$(grep "$PART_TYPE" "$OPENSLX_DISK_FLAG" | busybox wc -l)" -if [ "$INSTANCES" -ge 1 ]; then - # uhoh we are not alone! Need to check - # if the other instance actually did its job - warn "($$) '$0' already running for $PART_TYPE on $PART_DEV... checking state." - # here two/three cases depending on which PART_TYPE we are - # currently processing. - for timeout in 1 1 2; do - # always give the other instance time to finish - # but only check 3 times overall - sleep $timeout - case "$PART_TYPE" in - OPENSLX_TMP) - # was the tmp partition marker created with a device? - if [ ! -f "${OPENSLX_TMP_MARKER}" ]; then - info "($$) Invalid state: no marker for $PART_TYPE" - continue - fi - # it was, is it a valid block device? - OPENSLX_TMP_DEVICE="$(cat ${OPENSLX_TMP_MARKER})" - if [ -z $OPENSLX_TMP_DEVICE -o ! -b $OPENSLX_TMP_DEVICE ]; then - info "($$) Invalid state: no for device $OPENSLX_TMP_DEVICE" - continue - fi - # its detected, its a block device and as mounting is - # done later, we can not check for more at this point - info "($$) Valid state for $OPENSLX_TMP_DEVICE as $PART_TYPE" - exit 0 - ;; - OPENSLX_SYS) - # was the system partition marker created with a device? - if [ ! -f "${OPENSLX_SYS_MARKER}" ]; then - info "($$) Invalid state: no marker for $PART_TYPE" - continue - fi - # it was, is it a valid block device? - OPENSLX_SYS_DEVICE="$(cat ${OPENSLX_SYS_MARKER})" - if [ -z $OPENSLX_SYS_DEVICE -o ! -b $OPENSLX_SYS_DEVICE ]; then - info "($$) Invalid state: no for device $OPENSLX_SYS_DEVICE" - continue - fi - # its detected, its a block device, is it mounted? - if mount | grep -qE "^$OPENSLX_SYS_DEVICE\ on $OPENSLX_SYS_MOUNT"; then - info "($$) Valid state for $OPENSLX_SYS_DEVICE as $PART_TYPE" - exit 0 - fi - # if its not mounted, we want to keep on, so no exit! - ;; - *) - # weird case which should never happen - warn "($$) If you see this, then $0 was called with a bad PART_TYPE: $@" - continue - ;; - esac - done - warn "($$) Timeout reached!" - warn "($$) '$PART_TYPE' was found but not device was associated to it!" -fi - -# We write our pid to $OPENSLX_DISK_FLAG in order to make sure -# we are the only instance of this script running. -info "($$) Processing: $PART_TYPE -> $PART_DEV ($$)" -echo "$PART_TYPE.$$" >> "$OPENSLX_DISK_FLAG" - -# if we are still here, then we can go on and process the partition -if [ "$PART_TYPE" = "OPENSLX_TMP" ]; then - # always format /tmp partition - if ! format_disk "${PART_DEV}" xfs; then - # error while formatting, cleanup - warn "($$) Error formatting $PART_DEV ... removing $$" - sed -i "/^${PART_TYPE}\.$$/d" "${OPENSLX_DISK_FLAG}" - exit 1 - fi - info "($$) Using '$PART_DEV' as '$PART_TYPE'" - # mark it for later: in pre-pivot we will check this file - # and mount it as $NEWROOT/tmp - echo "$PART_DEV" > "$OPENSLX_TMP_MARKER" - # remove our pid from OPENSLX_DISK_FLAG - sed -i "/^${PART_TYPE}\.$$/d" "${OPENSLX_DISK_FLAG}" - exit 0 -fi -if [ "$PART_TYPE" = "OPENSLX_SYS" ]; then - # TODO make the formatting of the system partition configurable - if ! format_disk "${PART_DEV}" xfs; then - # error while formatting, cleanup - warn "($$) Error formatting $PART_DEV ... removing $$" - sed -i "/^${PART_TYPE}\.$$/d" "${OPENSLX_DISK_FLAG}" - exit 1 - fi - # mark it - # mount it now, since qemu-nbd needs it asap! - if mount_sys_part "$PART_DEV"; then - # mount worked, mark it as done - info "($$) Using '$PART_DEV' as '$PART_TYPE'" - echo "$PART_DEV" > "$OPENSLX_SYS_MARKER" - sed -i "/^${PART_TYPE}\.$$/d" "${OPENSLX_DISK_FLAG}" - exit 0 - else - warn "($$) 'mount_sys_part' failed in $0" - sed -i "/^${PART_TYPE}\.$$/d" "${OPENSLX_DISK_FLAG}" - exit 1 - fi -fi - -# -# END MAIN CODE -############################################################################### diff --git a/dev-tools/snippets.sh b/dev-tools/snippets.sh deleted file mode 100644 index 6f4f21cc..00000000 --- a/dev-tools/snippets.sh +++ /dev/null @@ -1,113 +0,0 @@ -su nobody -s /bin/bash -yaourt -S multipath-tools -exit - -# close running connection -./dnbd3-client -d /dev/dnbd0 -c - -# 1. connect to dnbd3 server -cd dnbd3/build -insmod dnbd3.ko -./dnbd3-client -h gateway -i archLinux.qcow2 -d /dev/dnbd0 - -# 2. make available partition in qemu container -modprobe nbd -qemu-nbd --connect=/dev/nbd0 /dev/dnbd0 --read-only - -# 2. make available partition in qemu container (writable) -# qemu-nbd --connect=/dev/nbd0 /dev/dnbd0 --snapshot -# todo where is the cow device? -# todo why does --partition not work? -# todo use qemu-img instead? - -# 3. mount container partition -modprobe dm_multipath -kpartx -av /dev/nbd0 # or use fdisk -l and mount offset -mount /dev/mapper/nbd0p2 /mnt/ - -# 5. cleanup -umount /mnt/ -kpartx -d /dev/nbd0 -qemu-nbd --disconnect /dev/nbd0 - - -# mount container partition directly -# yaourt -S libguestfs -guestmount -a /dev/dnbd0 -m /dev/sda2 --ro /mnt -v - - -# make read-only partition writable -mknod -m 660 /dev/ram0 b 1 1 -chown root.disk /dev/ram0 -DEV=/dev/mapper/nbd0p2 -SIZE=`blockdev --getsz $DEV` -dmsetup create sandbox --table "0 $SIZE snapshot $DEV /dev/ram0 N 1" -mount /dev/mapper/sandbox /mnt -umount /mnt -dmsetup remove sandbox - -modprobe loop -dd if=/dev/zero of=persistent_storage.img bs=1k count=1000 -losetup /dev/loop0 persistent_storage.img - -# Mount second partion example. -fdisk -lu -losetup -o $((1050624*512)) /dev/loop0 /dev/nbd0 -v -mount /dev/loop0 /mnt/ - -function create_partition_via_offset() { - local device="$1" - local nameOrUUID="$2" - local loopDevice=$(losetup -f) - - #local sector_size=$(fdisk -l -u $device | grep "Sector size" | cut -d' ' -f4) - local sectorSize=$(blockdev --getbsz $device) - echo sector size: $sectorSize - local partitionInfo=$(partx --raw --noheadings --output START,NAME,UUID /dev/nbd0 2>/dev/null| grep $nameOrUUID) - local offsetSectors=$(echo $partitionInfo | cut -d' ' -f1) - if [ -z "$offsetSectors" ]; then - build_initramfs_log 'error' \ - "could not find partition with label/uuid '$nameOrUUID' on device $device" - return 1 - fi - #echo $(($offsetSectors*512)) # could overflow on 32bit systems - offsetBytes=$(echo $| awk -v x=$offsetSectors -v y=$sectorSize '{print x * y}') - echo $offsetBytes - - # test if mount works directly (problem with btrfs device id) - #mount -v -o loop,offset=$offsetBytes $device $mountPoint - losetup -v -o $offsetBytes $loopDevice $device - echo $loopDevice -} -function make_partition_writable() { - local deviceName="$1" - local partition="$2" - local writable_device="$3" - - local size=$(blockdev --getsz $partition) - dmsetup create "$deviceName" --table \ - "0 $size snapshot $partition $writable_device N 1" - mount /dev/mapper/sandbox /mnt -} -function make_ram_device() { - mknod -m 660 /dev/ram0 b 1 1 - chown root.disk /dev/ram0 - echo /dev/ram0 -} -function make_device_from_file() { - local file="$1" - local sizeInMegaByte="$2" - #modprobe loop - local loopDevice=$(losetup -f) - dd if=/dev/zero of="$file" bs=1M count=$sizeInMegaByte - losetup "$loopDevice" "$file" - mkfs.ext4 "$loopDevice" - echo $loopDevice -} - -local partition=$(create_partition_via_offset "/dev/nbd0" "system") - -local writableDevice=$(make_device_from_file "persistent_storage.img" "50") -local writableDevice=$(make_ram_device) -make_partition_writable "sandbox" "$partition" "$writableDevice" -mount /dev/mapper/sandbox $mountPoint diff --git a/dev-tools/ubuntuStartup.nsh b/dev-tools/ubuntuStartup.nsh deleted file mode 100755 index 621056bc..00000000 --- a/dev-tools/ubuntuStartup.nsh +++ /dev/null @@ -1 +0,0 @@ -\EFI\ubuntu\grubx64.efi diff --git a/dev-tools/virtualBoxTFTPRoot/.gitignore b/dev-tools/virtualBoxTFTPRoot/.gitignore deleted file mode 100644 index 1a6307a5..00000000 --- a/dev-tools/virtualBoxTFTPRoot/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.img -*vmlinuz-linux diff --git a/dev-tools/virtualBoxTFTPRoot/README.md b/dev-tools/virtualBoxTFTPRoot/README.md deleted file mode 100644 index 63edb76e..00000000 --- a/dev-tools/virtualBoxTFTPRoot/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# Booting via pxe from virtualbox - -## create vm -the vm has to be named "pxeTest" (needs to match ./pxeTest.pxe) - -## configure vm -under settings->system add network boot - -## link/copy this directory into the virtualbox -config directory ->>> find ~ -name VirtualBox.xml -~/.VirtualBox/ ->>> ln -s . ~/.VirtualBox/ - -## copy initram and kernel ->>> cp /some/path/{initram.img,vmlinuz-linux} . diff --git a/dev-tools/virtualBoxTFTPRoot/ldlinux.c32 b/dev-tools/virtualBoxTFTPRoot/ldlinux.c32 deleted file mode 100755 index 0d8f2ef0..00000000 Binary files a/dev-tools/virtualBoxTFTPRoot/ldlinux.c32 and /dev/null differ diff --git a/dev-tools/virtualBoxTFTPRoot/libutil.c32 b/dev-tools/virtualBoxTFTPRoot/libutil.c32 deleted file mode 100755 index 496fc303..00000000 Binary files a/dev-tools/virtualBoxTFTPRoot/libutil.c32 and /dev/null differ diff --git a/dev-tools/virtualBoxTFTPRoot/memdisk b/dev-tools/virtualBoxTFTPRoot/memdisk deleted file mode 100644 index 3ada56c0..00000000 Binary files a/dev-tools/virtualBoxTFTPRoot/memdisk and /dev/null differ diff --git a/dev-tools/virtualBoxTFTPRoot/menu.c32 b/dev-tools/virtualBoxTFTPRoot/menu.c32 deleted file mode 100755 index a584b00c..00000000 Binary files a/dev-tools/virtualBoxTFTPRoot/menu.c32 and /dev/null differ diff --git a/dev-tools/virtualBoxTFTPRoot/pxeTest.pxe b/dev-tools/virtualBoxTFTPRoot/pxeTest.pxe deleted file mode 100644 index 61a38889..00000000 Binary files a/dev-tools/virtualBoxTFTPRoot/pxeTest.pxe and /dev/null differ diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.0 b/dev-tools/virtualBoxTFTPRoot/pxelinux.0 deleted file mode 100644 index 61a38889..00000000 Binary files a/dev-tools/virtualBoxTFTPRoot/pxelinux.0 and /dev/null differ diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default deleted file mode 100644 index 80014ee7..00000000 --- a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default +++ /dev/null @@ -1,52 +0,0 @@ -DEFAULT menu.c32 -TIMEOUT 300 -ALLOWOPTIONS 0 -PROMPT 0 - -MENU TITLE Janosch und Torbens Bastelspassmenu - -LABEL arch -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 ^archLinux debug -KERNEL /archLinux-vmlinuz-linux -APPEND initrd=/archLinux-initramfs-test.img loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break rd.break=pre-shutdown 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 ^archlinux serial debug -KERNEL /archLinux-vmlinuz-linux -APPEND initrd=/archLinux-initramfs-test.img loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break rd.break=pre-shutdown 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 -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 debug -KERNEL /ubuntu-vmlinuz-linux -APPEND initrd=/ubuntu-initramfs-test.img loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break rd.break=pre-shutdown 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 -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 debug -KERNEL /centOS-vmlinuz-linux -APPEND initrd=/centOS-initramfs-test.img loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break rd.break=pre-shutdown 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 -MENU LABEL ^Boot Normal (HDD) -LOCALBOOT 0 -- cgit v1.2.3-55-g7522