diff options
| author | Simon Rettberg | 2016-08-30 18:19:54 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-08-30 18:19:54 +0200 |
| commit | 98fb0fe15fdfe40fedf178d56d3952d859475697 (patch) | |
| tree | 3d4979ddacb623cf5710f6ecbd0d3787d064ae9e | |
| parent | [rfs-stage32] Add ip6tables (diff) | |
| download | tm-scripts-98fb0fe15fdfe40fedf178d56d3952d859475697.tar.gz tm-scripts-98fb0fe15fdfe40fedf178d56d3952d859475697.tar.xz tm-scripts-98fb0fe15fdfe40fedf178d56d3952d859475697.zip | |
[run-virt] Fix firewall setup by making wget calls busybox compliant, +s fw-binary
4 files changed, 4 insertions, 4 deletions
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/detect_legacy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/detect_legacy.inc index f77e955b..8bdfd8b1 100644 --- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/detect_legacy.inc +++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/detect_legacy.inc @@ -19,7 +19,7 @@ if [ -z "$IMGUUID" ]; then # Keine uuid: Abbruch, Legacy writelog "Could not extract a uuid param from ${xmlfile}. Triggering legacy mode." else # Now getting template file: - if ! wget -O "$TMPCONFIG" "${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}" 2>/dev/null >&2; then + if ! wget -T 6 -O "$TMPCONFIG" "${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}" 2>/dev/null >&2; then writelog "wget ${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}. Triggering legacy mode." else writelog "wget ${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID} successful." diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc index 0b64b9e2..3fd5c109 100644 --- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc +++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc @@ -7,7 +7,7 @@ declare -rg FLOPPYIMG="${TMPDIR}/floppy.img" declare -rg TMPHOME="${HOME}" declare -rg RUNSCRIPT="${TMPDIR}/runscript.tmp" -wget -T 6 -O "${RUNSCRIPT}" -nv "${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}/runscript" & +wget -T 6 -O "${RUNSCRIPT}" "${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}/runscript" > /dev/null & WGET=$! dd "if=/dev/zero" "of=${FLOPPYIMG}" count=1440 bs=1024 diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/scripts/set-firewall b/remote/modules/run-virt/data/opt/openslx/vmchooser/scripts/set-firewall index 02ba2b5c..2773150c 100644 --- a/remote/modules/run-virt/data/opt/openslx/vmchooser/scripts/set-firewall +++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/scripts/set-firewall @@ -65,7 +65,7 @@ fi sort -u "${AUTORULES}" > "${RULES}" -wget -T 6 --no-verbose -O - "${SLX_VMCHOOSER_BASE_URL}/lecture/$1/netrules" >> "${RULES}" 2> "${AUTORULES}" +wget -T 6 -O - "${SLX_VMCHOOSER_BASE_URL}/lecture/$1/netrules" >> "${RULES}" 2> "${AUTORULES}" RET=$? if [ "$RET" != "0" ]; then diff --git a/remote/modules/run-virt/module.build b/remote/modules/run-virt/module.build index eb718599..56afd839 100644 --- a/remote/modules/run-virt/module.build +++ b/remote/modules/run-virt/module.build @@ -15,6 +15,6 @@ build () { } post_copy() { - : + chmod +s "${TARGET_BUILD_DIR}/opt/openslx/bin/slxfwtool" || perror "Could not set suid bit on slxfwtool" } |