bcf529ce80
This change adds extra tests to the elements/manifests/cleanup.d/01-copy-manifests-dir script to prevent it from exiting with an error due to non-existant files. The premature exit condition only seems to happen when an image is being created without including the "base" element. Changes * adding file detection tests for dib_arguments and dib_environment files Closes-Bug: #1308224 Change-Id: Iaa8bafb6765241408b9f02d4896913d15f2f401d
32 lines
1.2 KiB
Bash
Executable File
32 lines
1.2 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# Copyright 2014 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.
|
|
#
|
|
set -eux
|
|
|
|
if [ -d $TMP_MOUNT_PATH/${DIB_MANIFEST_IMAGE_DIR} ]; then
|
|
# Move the dib_environment and dib_arguments files into the manifests dir
|
|
if [ -e $TMP_MOUNT_PATH/etc/dib_arguments ]; then
|
|
sudo mv $TMP_MOUNT_PATH/etc/dib_arguments $TMP_MOUNT_PATH/${DIB_MANIFEST_IMAGE_DIR}
|
|
fi
|
|
if [ -e $TMP_MOUNT_PATH/etc/dib_environment ]; then
|
|
sudo mv $TMP_MOUNT_PATH/etc/dib_environment $TMP_MOUNT_PATH/${DIB_MANIFEST_IMAGE_DIR}
|
|
fi
|
|
mkdir -p ${DIB_MANIFEST_SAVE_DIR}
|
|
cp --no-preserve=ownership -rv $TMP_MOUNT_PATH/${DIB_MANIFEST_IMAGE_DIR} \
|
|
${DIB_MANIFEST_SAVE_DIR}
|
|
fi
|