diff options
| author | Simon Rettberg | 2018-07-12 11:18:34 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-07-12 11:18:34 +0200 |
| commit | 07270af89b9dbdca6d0cb85701b5cad179b19d10 (patch) | |
| tree | 32c8be2a728e7615bfe0e4b22379c523b1fd6f16 /core | |
| parent | [client] Small improvements for visibility flag (diff) | |
| download | mltk-07270af89b9dbdca6d0cb85701b5cad179b19d10.tar.gz mltk-07270af89b9dbdca6d0cb85701b5cad179b19d10.tar.xz mltk-07270af89b9dbdca6d0cb85701b5cad179b19d10.zip | |
[debug-report-bwlp] Include list of config.tgz files
Diffstat (limited to 'core')
| -rwxr-xr-x | core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report | 2 | ||||
| -rw-r--r-- | core/rootfs/rootfs-stage31/data/inc/activate_sysconfig | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report b/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report index 9ba64825..20c167a6 100755 --- a/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report +++ b/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report @@ -63,7 +63,7 @@ for srv in $SLX_NTP_SERVER 0.de.pool.ntp.org; do done echo -n "..." -cp /opt/openslx/config /tmp/udhcpclog static/ 2> /dev/null +cp /opt/openslx/config /tmp/udhcpclog /opt/openslx/config.tgz.list static/ 2> /dev/null echo -n "." FILES=$(find /tmp/vmware* /tmp/virt /tmp/vmchooser* -type f \( -name "*.log" -o -name "*.conf" -o -name "*.xml" \) 2> /dev/null) diff --git a/core/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/core/rootfs/rootfs-stage31/data/inc/activate_sysconfig index 3f109408..45f3832e 100644 --- a/core/rootfs/rootfs-stage31/data/inc/activate_sysconfig +++ b/core/rootfs/rootfs-stage31/data/inc/activate_sysconfig @@ -66,6 +66,8 @@ install_config_tgz() { # TODO perserve existing directories permissions (but overwrite the permissions of files!) mkdir -p "${TEMP_EXTRACT_DIR}" tar xf "${CONFIG}.tgz" -C "${TEMP_EXTRACT_DIR}" || { echo "Could not untar ${CONFIG}.tgz to ${TEMP_EXTRACT_DIR}"; return 1; } + # Write list to stage32 for debug + tar tvf "${CONFIG}.tgz" > "${FUTURE_ROOT}/opt/openslx/config.tgz.list" 2>&1 chown -R 0:0 "${TEMP_EXTRACT_DIR}" 2>/dev/null cd "${TEMP_EXTRACT_DIR}" # first we look for local config.tgz files, which we merge with the common |