diff options
| -rwxr-xr-x | bin/build.initramfs-serial.sh | 5 | ||||
| -rw-r--r-- | inc/functions.iso.sh | 13 | ||||
| -rw-r--r-- | inc/functions.pbs-serials.sh | 2 |
3 files changed, 5 insertions, 15 deletions
diff --git a/bin/build.initramfs-serial.sh b/bin/build.initramfs-serial.sh deleted file mode 100755 index 862c50d..0000000 --- a/bin/build.initramfs-serial.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -ROOT_DIR=$(readlink -f $(dirname $(readlink -f $0))/..) - -echo -e "[build-initramfs-serial] \t Create initramfs-serial." diff --git a/inc/functions.iso.sh b/inc/functions.iso.sh index 60176bd..c5508b3 100644 --- a/inc/functions.iso.sh +++ b/inc/functions.iso.sh @@ -94,7 +94,7 @@ copy_files () { get_preboot_serial() { - pinfo "Retrieving Serials..." + pinfo "Retrieving serials..." unset_quiet wget -qO- pbs2.mp.openslx.org/resource/getprebootserials/apikey/apikey_uni-freiburg | cat @@ -102,18 +102,13 @@ get_preboot_serial() { pechon "Choose serial to use for the image.\n\tPress the corresponding number, or r for random serial or empty for default serial: " read serial_choice - if [ "x$serial_choice" = "xr" ] - then - : # get random serial from pbs - else - wget -O $TMP_DIR/serial pbs2.mp.openslx.org/resource/getprebootserials/apikey/apikey_uni-freiburg/serialnr/$serial_choice - fi + wget -O $TMP_DIR/serial pbs2.mp.openslx.org/resource/getprebootserials/apikey/apikey_uni-freiburg/serialnr/$serial_choice } create_serial_module() { - pinfo "Writing InitramFS Serial Module ..." + pinfo "Writing initramfs serial module ..." cd $TMP_DIR @@ -145,7 +140,7 @@ create_iso () { run () { set_quiet - + pre_start_cleanup setup_dir_structure get_preboot_serial diff --git a/inc/functions.pbs-serials.sh b/inc/functions.pbs-serials.sh index 784052b..a079e9e 100644 --- a/inc/functions.pbs-serials.sh +++ b/inc/functions.pbs-serials.sh @@ -29,7 +29,7 @@ read_params() { eval set -- "$GETOPT_TEMP" while true ; do - case "$1" in + case "$1" in -v|--version) echo "OpenSLX PreBoot .. ($VERSION - $VDATE)." exit 0 |