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
This commit is contained in:
parent
86a5288ff5
commit
96a11fa46a
|
@ -0,0 +1 @@
|
|||
../elements/dib-run-parts/bin/dib-run-parts
|
|
@ -0,0 +1,88 @@
|
|||
#!/bin/bash
|
||||
# Inspired by Debian and RedHat run-parts but portable and specific to di-b.
|
||||
#
|
||||
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
allowed_regex=${RUN_PARTS_REGEX:-"^[0-9A-Za-z_-]+$"}
|
||||
|
||||
set -ue
|
||||
|
||||
name=$(basename $0)
|
||||
|
||||
usage() {
|
||||
echo "usage: $name scripts_directory" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
output () {
|
||||
echo $name $(date) $* >&2
|
||||
}
|
||||
|
||||
if [ $# -lt 1 ] ; then
|
||||
usage
|
||||
fi
|
||||
|
||||
target_dir=$1
|
||||
|
||||
if ! [ -d $target_dir ] ; then
|
||||
output $target_dir must exist and be a directory
|
||||
usage
|
||||
fi
|
||||
|
||||
# We specifically only want to sort *by the numbers*.
|
||||
# Lexical sorting is not guaranteed, and identical numbers may be
|
||||
# parallelized later
|
||||
# Note: -maxdepth 1 ensures only files in the target directory (but not
|
||||
# subdirectories) are run, which is the way run-parts behaves.
|
||||
targets=$(find $target_dir -maxdepth 1 -type f -executable -printf '%f\n' | grep -E "$allowed_regex" | LANG=C sort -n)
|
||||
|
||||
PROFILE_DIR=$(mktemp -d /tmp/profiledir.XXXXXX)
|
||||
|
||||
if [ -d /tmp/in_target.d/environment.d ] ; then
|
||||
for env_file in /tmp/in_target.d/environment.d/* ; do
|
||||
source $env_file
|
||||
done
|
||||
fi
|
||||
|
||||
for target in $targets ; do
|
||||
output "Running $target_dir/$target"
|
||||
target_tag=${target//\//_}
|
||||
date +%s.%N > $PROFILE_DIR/start_$target_tag
|
||||
$target_dir/$target
|
||||
target_tag=${target//\//_}
|
||||
date +%s.%N > $PROFILE_DIR/stop_$target_tag
|
||||
output "$target completed"
|
||||
done
|
||||
|
||||
echo "----------------------- PROFILING -----------------------"
|
||||
echo ""
|
||||
echo "Target: $(basename $target_dir)"
|
||||
echo ""
|
||||
printf "%-40s %9s\n" Script Seconds
|
||||
printf "%-40s %9s\n" --------------------------------------- ----------
|
||||
echo ""
|
||||
pushd $PROFILE_DIR > /dev/null
|
||||
for target in $(find . -name 'start_*' -printf '%f\n') ; do
|
||||
stop_file=stop_${target##start_}
|
||||
start_seconds=$(cat $target)
|
||||
stop_seconds=$(cat $stop_file)
|
||||
duration=$(python -c "print $stop_seconds - $start_seconds")
|
||||
printf "%-40s %10.3f\n" ${target##start_} $duration
|
||||
done
|
||||
popd > /dev/null
|
||||
rm -rf $PROFILE_DIR
|
||||
echo ""
|
||||
echo "--------------------- END PROFILING ---------------------"
|
Loading…
Reference in New Issue