Skip to content

Commit

Permalink
CP-45506: Fix asking if /etc/systemd/* should be collected
Browse files Browse the repository at this point in the history
For CP-45506 (Package /etc/systemd into a tarball), I had assumed
that I'd have to move the tree_output() for /etc/systemd to after
where the tarball for /etc/systemd is declared, but this was not
needed.

Moving it had the side effect that in interactive mode (a question
if each individual file shall be collected - hundreds of questions
usually), the /etc/systemd tarball was simply always collected.

This commit fixes this by reverting this move, back to the original
location of this line, to before the question if the files in
/etc/systemd/* shall be collected.

Signed-off-by: Bernhard Kaindl <[email protected]>
  • Loading branch information
bernhardkaindl committed Jan 12, 2024
1 parent 57db87f commit 2649c4a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion xen-bugtool
Original file line number Diff line number Diff line change
Expand Up @@ -1075,6 +1075,7 @@ exclude those logs from the archive.
tree_output(CAP_XENSERVER_CONFIG, STATIC_VDIS)
cmd_output(CAP_XENSERVER_CONFIG, [LS, '-lR', STATIC_VDIS])
file_output(CAP_XENSERVER_CONFIG, [SYSCONFIG_CLOCK])
tree_output(CAP_XENSERVER_CONFIG, SYSTEMD_CONF_DIR)
file_output(CAP_XENSERVER_CONFIG, [CGRULES_CONF])
file_output(CAP_XENSERVER_CONFIG, [NRPE_CONF])
tree_output(CAP_XENSERVER_CONFIG, NRPE_DIR)
Expand Down Expand Up @@ -1189,7 +1190,6 @@ exclude those logs from the archive.
else:
archive = ZipOutput(subdir)
archive.declare_subarchive(SYSTEMD_CONF_DIR, subdir + SYSTEMD_CONF_DIR + ".tar")
tree_output(CAP_XENSERVER_CONFIG, SYSTEMD_CONF_DIR)

# collect selected data now
output_ts('Running commands to collect data')
Expand Down

0 comments on commit 2649c4a

Please sign in to comment.