Sourcing of environment files is a bit different than running scripts,
because they are imported into the current environment. That means
that if they are fiddling with "set -x" you can get odd things in the
output -- for example, if one environment file enables tracing then
all proceeding sourcing will have it on, but all the files sourced
before will not have output. This is super confusing.
It's also very helpful to see how things are being expanded as they
set environment variables.
Thus I think the best idea is for environment files to leave tracing
alone and dib-run-parts can a) give a useful output about what file it
is sourcing and b) enable tracing around the import, then restore it
to the previous state afterwards.
Change-Id: I29f7df1514aeb988222d1094e8269eddb485c2a0
In bash the only sensible way of returning a string from functions
or scripts is via stdout.
dib-run-parts not only 'returned' the output of the called scripts but
also some statistics / performance output.
Other parts of the script already used an 'output' function so
the statistics output was adapted to also use this kind of function.
In addition three simple test cases are implemented to check
the basic functions of the script.
As a result the log-output of the dib-run-parts is somewhat cleaner.
It also makes debugging of the called scripts easier.
This change is the precondition for simplification of functions like
diskimage-builder's eval_run_d.
Change-Id: Ie2f0332359a72ca7ab03f94b7573e073df714a97
Signed-off-by: Andreas Florath <andreas@florath.net>
By sourcing the environment files directly into the running process,
dib-run-parts can pollute its own environment. For example, if an
environment script enables tracing (set -x) then that enables tracing
for dib-run-parts; particularly annoying as it then spews a bunch of
stuff relating to the profiling.
Move to sourcing the environment files in a subshell with the scripts
to be executed to keep things separate.
Change-Id: I1e39822f218dc0322e2490a770f3dc867a55802c
This allows to run dib-run-parts on systems where python is not
installed, such as Debian docker image. Generally, awk is more likely to
be available than python.
Change-Id: I26d7ad55a56ca4785a779f576e2da50a69400563
dib-run-parts in dib-utils had several fixes missing that had been
committed to diskimage-builder. When diskimage-builder switched to using
dib-run-parts from dib-utils, we lost these fixes. The switch over
happened in Ia0a0df7784a14c49b5c47ac0b03e6c2602c84b3b
These are the fixes from diskimage-builder that this commit adds back:
I44cf98dfc80cfcaec54b88cc83be80a3dbf2cec3
I24fd76c2b4f66b8036010b5079db39ead729abee
Iad2d490c86dceab148ea9ab08f457c49a5d5352e
Ieb48faacb4c96b7b358771d70c17f2f22d0354f4
Ia68853505485fefbf0890313456e7edb6097666b
Ibfb562c5970b40598fc95da1e8d4beb9d51d7612
Change-Id: Ice4b6a4b3d36a02099a682ae8cda4721211d51d9
When showing the timings of the executed scripts, sort the scripts in
the same way they were executed. This eases the comparison between runs
of dib-run-parts.
Change-Id: I171499c30e1a992d7225be8a9dc00e0f03ec46b0
Pass --tmpdir to mktemp so the new temporary directory is placed
within $TMPDIR, or falling back to /tmp. This way dib-run-parts can
use whatever the temporary directory is, instead of using an hardcoded
/tmp.
Change-Id: I6b55e3c6c1fe22108ea555d3766e0323695bd96d
Force LC_ALL to C to allow printf to work independently
from the locale. Gives invalid number error if run in non-english
locale.
Port to dib-utils of: Ia68853505485fefbf0890313456e7edb6097666b
Change-Id: Ibbfa7a4a91dca72b16bb8fcb9602b71eccf54008
The current glob match for environment files can source editor backup
files (foo.bash~) which will override the real changes you have made.
Other parts use the regex to avoid matching such files, so do
the same for environment file matching. Note this has to match "."
unlike the other regex, as most env files are "foo.bash"
Port to dib-utils of: I934486b3ff5884063d29c6d9b66fd9b11140464c
Change-Id: I11c030e8556d89c240e36233b249f0c1d9f80908
This change adjusts the "inline" python function used to profile
run-parts duration to make it run successfully on both py2 and py3
Change-Id: If1e6ac6fe528ca0225dcdbe5774545512be9d13a
- Ensures /sbin and friends are in $PATH when invoked (without this,
various sudo invocations fail in exciting ways).
- Use dib-run-parts in lib/common-functions instead of run-parts
(neither SLES nor openSUSE ship run-parts).
- Ensure dib-run-parts doesn't descend into subdirectories (same
behaviour as run-parts).
- Move dib-run-parts from root.d to bin (cleaner, consistent with
other elements with separate bin scripts).
- Tested by building Ubuntu image on openSUSE 12.3.
- Note: this doesn't add support for creating SUSE images, it just
lets you run disk-image-create on SUSE-based distros.
Change-Id: I906c6bc3cf51cdf2c4415adeae1ca250faac25e1
Ramdisks are now built inside a chroot which is built by the normal
image build process. Doing so improves our independence of the
precise state of the build host.
This fixes bug 1194055.
Change-Id: Ibc254fbb9e7b404b5f38c1b35bcde8a4136e8e28
This adds a new optional file to the root of elements. The
file lists dependencies which will be added to the list
requested by the user during disk image creation.
Change-Id: Id71c3b333563604bbbaf90f9cf40e24fa9738fc8
Ghanshyam Mann