ee5ae03d58
- 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
50 lines
1.5 KiB
Plaintext
50 lines
1.5 KiB
Plaintext
# 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.
|
|
|
|
# options for create-baremetal-image.sh
|
|
if [ -f /etc/debian_version ]; then
|
|
_ARCH=$(dpkg --print-architecture)
|
|
else
|
|
_ARCH=$(uname -m)
|
|
case $_ARCH in
|
|
"x86_64")
|
|
_ARCH="amd64"
|
|
;;
|
|
"armv"*)
|
|
_ARCH="armhf"
|
|
;;
|
|
*)
|
|
echo "WARNING: Unknown architecture: $_ARCH"
|
|
;;
|
|
esac
|
|
fi
|
|
ARCH=${ARCH:-$_ARCH}
|
|
export ARCH
|
|
|
|
export DIB_NO_TMPFS=${DIB_NO_TMPFS:-0}
|
|
# Set via the CLI normally.
|
|
# IMAGE_ELEMENT=
|
|
_BASE_ELEMENT_DIR=$(dirname $0)/../elements
|
|
ELEMENTS_PATH=${ELEMENTS_PATH:+"$ELEMENTS_PATH:$_BASE_ELEMENT_DIR"}
|
|
export ELEMENTS_PATH=${ELEMENTS_PATH:-$_BASE_ELEMENT_DIR}
|
|
export DIB_OFFLINE=${DIB_OFFLINE:-''}
|
|
|
|
# /sbin and friends aren't automatically included in $PATH when running sudo
|
|
# on SUSE Linux which breaks various pieces of this script in exciting ways,
|
|
# so inject them into the current $PATH if they're not there.
|
|
if ! [[ "$PATH" =~ "/sbin" ]] ; then
|
|
export PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
|
|
fi
|