Merge branch 'devel' into 'main'

Devel

See merge request release-engineering/public/toolkit!39
This commit is contained in:
Louis Abel 2021-11-12 05:00:35 +00:00
commit ba6e9911e0
3 changed files with 13 additions and 12 deletions

View File

@ -116,8 +116,8 @@ EOF
function treeinfoModderKickstart() { function treeinfoModderKickstart() {
BaseOSArch="${1}" BaseOSArch="${1}"
TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo" TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/kickstart/.treeinfo"
PRISTINE_TREE="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo-pristine" PRISTINE_TREE="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/kickstart/.treeinfo-pristine"
test -f "${TREEINFO_VAR}" test -f "${TREEINFO_VAR}"
treeinfo_retval=$? treeinfo_retval=$?
test -x /usr/bin/python3 test -x /usr/bin/python3

View File

@ -60,6 +60,7 @@ for ARCH in "${ARCHES[@]}"; do
cp "${SOURCE}"/*.iso "${TARGET}/" cp "${SOURCE}"/*.iso "${TARGET}/"
cp "${SOURCE}"/*.iso.manifest "${TARGET}/" cp "${SOURCE}"/*.iso.manifest "${TARGET}/"
pushd "${TARGET}" || { echo "Could not change directory"; break; } pushd "${TARGET}" || { echo "Could not change directory"; break; }
done
# shellcheck disable=SC2086 # shellcheck disable=SC2086
for file in *.iso; do for file in *.iso; do
printf "# %s: %s bytes\n%s\n" \ printf "# %s: %s bytes\n%s\n" \
@ -69,7 +70,6 @@ for ARCH in "${ARCHES[@]}"; do
| sudo tee -a CHECKSUM; | sudo tee -a CHECKSUM;
done done
popd || { echo "Could not change directory"; break; } popd || { echo "Could not change directory"; break; }
done
done done
# make a kickstart directory # make a kickstart directory

View File

@ -29,7 +29,8 @@ if [ $ret_val -eq "0" ]; then
cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; } cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; }
/bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old
/usr/local/bin/create-filelist > fullfiletimelist-rocky /usr/local/bin/create-filelist > fullfiletimelist-rocky
cp fullfiletimelist-rocky fullfiletimelist
fi fi
chown 10004:10005 fullfilelist fullfiletimelist-rocky chown 10004:10005 fullfilelist fullfiletimelist-rocky fullfiletimelist
fi fi