870374c8da
dib_[environment|args] manifest files are currently generated by the base element and then moved by the manifest element. This creates too many corner cases -- if you don't include the base element (we are trying to empty it ATM) you don't get the env/args saved at all; if you include base but don't include the manifest element they're saved to /etc, but if you do have the manifest element they're moved to the manifest dir. Move generation of these into the manifest element directly and update the documentation to reflect this. In practice this doesn't change things, because the "manifests" element gets pulled in via deps for most builds. Change-Id: I3f23037058137d166b29f0b70fd1a02c22c07fc8 Signed-off-by: Andreas Florath <andreas@florath.net>
37 lines
1.3 KiB
Bash
Executable File
37 lines
1.3 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# Copyright 2014 Hewlett-Packard Development Company, L.P.
|
|
# Copyright 2017 Andreas Florath (andreas@florath.net)
|
|
#
|
|
# 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.
|
|
#
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
MANIFEST_IMAGE_PATH=${TMP_MOUNT_PATH}/${DIB_MANIFEST_IMAGE_DIR}
|
|
|
|
# Double check: directory must be created in extra-data.d/20-manifest-dir
|
|
[ -d ${MANIFEST_IMAGE_PATH} ] || {
|
|
echo "Error: MANIFEST_IMAGE_PATH [${MANIFEST_IMAGE_PATH}] does not exist";
|
|
exit 1; }
|
|
|
|
echo "$DIB_ENV" | sudo dd of=${MANIFEST_IMAGE_PATH}/dib_environment # dib-lint: safe_sudo
|
|
echo "$DIB_ARGS" | sudo dd of=${MANIFEST_IMAGE_PATH}/dib_arguments # dib-lint: safe_sudo
|
|
|
|
mkdir -p ${DIB_MANIFEST_SAVE_DIR}
|
|
cp --no-preserve=ownership -rv ${MANIFEST_IMAGE_PATH} ${DIB_MANIFEST_SAVE_DIR}
|