sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1bdeaadc95
diskimage-builder/diskimage_builder/elements/dib-run-parts/root.d/90-base-dib-run-parts

20 lines
447 B
Plaintext
Raw Normal View History

Use dib-run-parts for running scripts in target Also modified dib-run-parts to apply a more workable solution for filtering out unwanted files such as editor backups and VCS. The script is installed in its own element, depended on by the OS specific ubuntu element. This is because the ubuntu element (and later other OS's) are responsible for populating the root filesystem. If we try to install this in base, the root filesystem will look to be populated already and we will skip automatically choosing ubuntu. Change-Id: I017646748c1a8360299106289b57d976d45875a8
2013-02-14 18:20:30 +00:00
#!/bin/bash
Enable running disk-image-create on SUSE Linux - 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
2013-07-22 10:06:54 +00:00
Standarise tracing for scripts There is a wide variety of tracing options through the various shell scripts. Some use "set -eux", others explicity set xtrace and others do nothing. There is a "-x" option to bin/disk-image-create but it doesn't flow down to the many scripts it calls. This adds a global integer variable set by disk-image-create DIB_DEBUG_TRACE. All scripts have a stanza added to detect this and turn on tracing. Any other tracing methods are rolled into this. So the standard header is --- if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then set -x fi set -eu set -o pipefail --- Multiple -x options can be specified to dib-create-image, which increases the value of DIB_DEBUG_TRACE. If script authors feel their script should only trace at higher levels, they should modify the "-gt" value. If they feel it should trace by default, they can modify the default value also. Changes to pachset 16 : scripts which currently trace themselves by default have retained this behaviour with DIB_DEBUG_TRACE defaulting to "1". This was done by running [1] on patch set 15. See the thread beginning at [2] dib-lint is also updated to look for the variable being matched. [1] https://gist.github.com/ianw/71bbda9e6acc74ccd0fd [2] http://lists.openstack.org/pipermail/openstack-dev/2014-November/051575.html Change-Id: I6c5a962260741dcf6f89da9a33b96372a719b7b0
2014-09-04 04:56:29 +00:00
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
set -x
fi
set -u and -o pipefail everywhere As with the previous similar changes, this is intended to catch problems as they happen instead of ignoring them and continuing on to potentially fail later. Setting this on all existing scripts will allow us to enforce use via Jenkins. Change-Id: Iad2d490c86dceab148ea9ab08f457c49a5d5352e
2014-04-03 02:24:15 +00:00
set -eu
set -e all the things Using set -e in all of our scripts will prevent some subtle bugs from slipping in, and will allow us to enforce use of set -e with tooling. This change also adds -u and set -o pipefail in the less complex scripts where it is unlikely to cause problems. A follow-up change will enable those options in the complex scripts so that if it breaks something it can be reverted easily. Change-Id: I0ad358ccb98da7277a0ee2e9ce8fda98438675eb
2014-03-29 03:28:22 +00:00
set -o pipefail
dib-run-parts: make cp to target root more robust The dib-run-parts/root.d/90-base-dib-run-parts script would mysteriously fail whenever the dib-run-parts is not in the path. The install commands complaining with: install: missing destination file operand after '/tmp/image.ILFTBYVy/mnt/usr/local/bin/dib-run-parts' The reason is chaining a command in exec bypasses set -e. For example: exec /bin/ls $(which doesnotexist) Will works and continue. Handle the which lookup in a variable to have the script abort immediately whenever dib-run-parts is not found. Left an inline comment to make sure the fix is kept around in the future. Signed-off-by: Dan Duvall <dduvall@wikimedia.org> Change-Id: Ibb5d7342b0d06483b84f9dd567e1cc0bf90f194e
2015-09-01 20:49:25 +00:00
# Abort early if dib-run-parts is not found to prevent a meaningless
# error message from the subsequent install command
Move dib-run-parts into diskimage-builder Move dib-run-parts from dib-utils into diskimage-builder directly. For calling outside the chroot, we provide a standard entry-point script. However, as noted in the warning comment, the underlying script is still copied directly into the chroot by the dib-run-parts element. I believe this to be the KISS approach. This removes the dependency on dib-utils. We have discussed this previously and nobody seemed to think retiring dib-utils was going to be an issue. This also updates the documentation to not mention dib-utils, or using disk-image-create via $PATH setup, but rather gives instructions on installing from pip with a virtualenv. Change-Id: Ic1e22ba498d2c368da7d72e2e2b70ff34324feb8
2016-11-03 00:38:39 +00:00
DIB_RUN_PARTS=${_LIB}/dib-run-parts
if [ ! -f ${DIB_RUN_PARTS} ]; then
echo "Can't find dib-run-parts script!"
fi
dib-run-parts: make cp to target root more robust The dib-run-parts/root.d/90-base-dib-run-parts script would mysteriously fail whenever the dib-run-parts is not in the path. The install commands complaining with: install: missing destination file operand after '/tmp/image.ILFTBYVy/mnt/usr/local/bin/dib-run-parts' The reason is chaining a command in exec bypasses set -e. For example: exec /bin/ls $(which doesnotexist) Will works and continue. Handle the which lookup in a variable to have the script abort immediately whenever dib-run-parts is not found. Left an inline comment to make sure the fix is kept around in the future. Signed-off-by: Dan Duvall <dduvall@wikimedia.org> Change-Id: Ibb5d7342b0d06483b84f9dd567e1cc0bf90f194e
2015-09-01 20:49:25 +00:00
Use dib-run-parts for running scripts in target Also modified dib-run-parts to apply a more workable solution for filtering out unwanted files such as editor backups and VCS. The script is installed in its own element, depended on by the OS specific ubuntu element. This is because the ubuntu element (and later other OS's) are responsible for populating the root filesystem. If we try to install this in base, the root filesystem will look to be populated already and we will skip automatically choosing ubuntu. Change-Id: I017646748c1a8360299106289b57d976d45875a8
2013-02-14 18:20:30 +00:00
exec sudo install -m 0755 -o root -g root -D \
dib-run-parts: make cp to target root more robust The dib-run-parts/root.d/90-base-dib-run-parts script would mysteriously fail whenever the dib-run-parts is not in the path. The install commands complaining with: install: missing destination file operand after '/tmp/image.ILFTBYVy/mnt/usr/local/bin/dib-run-parts' The reason is chaining a command in exec bypasses set -e. For example: exec /bin/ls $(which doesnotexist) Will works and continue. Handle the which lookup in a variable to have the script abort immediately whenever dib-run-parts is not found. Left an inline comment to make sure the fix is kept around in the future. Signed-off-by: Dan Duvall <dduvall@wikimedia.org> Change-Id: Ibb5d7342b0d06483b84f9dd567e1cc0bf90f194e
2015-09-01 20:49:25 +00:00
$DIB_RUN_PARTS \
Use dib-run-parts for running scripts in target Also modified dib-run-parts to apply a more workable solution for filtering out unwanted files such as editor backups and VCS. The script is installed in its own element, depended on by the OS specific ubuntu element. This is because the ubuntu element (and later other OS's) are responsible for populating the root filesystem. If we try to install this in base, the root filesystem will look to be populated already and we will skip automatically choosing ubuntu. Change-Id: I017646748c1a8360299106289b57d976d45875a8
2013-02-14 18:20:30 +00:00
$TARGET_ROOT/usr/local/bin/dib-run-parts
Reference in New Issue Copy Permalink