TT#173500 Create tmpfiles with template name

We want to be able to track down any left-behind tmp files,
so ensure we're creating them with according file names.

Change-Id: I4eb44047f2eb86ba9f0a8aeeb8d6555290f60c00
mr10.5.1
Michael Prokop 3 years ago
parent 15aaad8edb
commit 8e063362ef

@ -31,8 +31,8 @@ if [ -n "${3:-}" ] ; then
SCREENSHOT_COMPARE="$3" SCREENSHOT_COMPARE="$3"
fi fi
QEMU_MONITOR=$(mktemp) QEMU_MONITOR=$(mktemp -t iso-tester-qemu.XXXXXXXXXX)
SCREENDUMP=$(mktemp) SCREENDUMP=$(mktemp -t iso-tester-screen.XXXXXXXXXX)
send_command() { send_command() {
echo "$*" | socat - UNIX-CONNECT:"${QEMU_MONITOR}" echo "$*" | socat - UNIX-CONNECT:"${QEMU_MONITOR}"

@ -176,10 +176,10 @@ ensure_recent_package_versions() {
# use temporary apt database for speed reasons # use temporary apt database for speed reasons
local TMPDIR local TMPDIR
TMPDIR=$(mktemp -d) TMPDIR=$(mktemp -d -t ngcp-deployment-recent-tmp.XXXXXXXXXX)
mkdir -p "${TMPDIR}/statedir/lists/partial" "${TMPDIR}/cachedir/archives/partial" mkdir -p "${TMPDIR}/statedir/lists/partial" "${TMPDIR}/cachedir/archives/partial"
local debsrcfile local debsrcfile
debsrcfile=$(mktemp) debsrcfile=$(mktemp -t ngcp-deployment-recent-debsrc.XXXXXXXXXX)
echo "deb ${SIPWISE_REPO_TRANSPORT}://${SIPWISE_REPO_HOST}/grml.org grml-testing main" >> "${debsrcfile}" echo "deb ${SIPWISE_REPO_TRANSPORT}://${SIPWISE_REPO_HOST}/grml.org grml-testing main" >> "${debsrcfile}"
DEBIAN_FRONTEND='noninteractive' apt-get \ DEBIAN_FRONTEND='noninteractive' apt-get \
@ -269,7 +269,7 @@ ensure_packages_installed() {
# so is installed from management node so these additional packages have to be accessible from # so is installed from management node so these additional packages have to be accessible from
# sipwise repo # sipwise repo
local TMPDIR local TMPDIR
TMPDIR=$(mktemp -d) TMPDIR=$(mktemp -d -t ngcp-deployment-ensure-tmp.XXXXXXXXXX)
mkdir -p "${TMPDIR}/etc/preferences.d" "${TMPDIR}/statedir/lists/partial" \ mkdir -p "${TMPDIR}/etc/preferences.d" "${TMPDIR}/statedir/lists/partial" \
"${TMPDIR}/cachedir/archives/partial" "${TMPDIR}/cachedir/archives/partial"
chown _apt -R "${TMPDIR}" chown _apt -R "${TMPDIR}"
@ -811,7 +811,7 @@ get_installer_path() {
if [ -n "${NGCP_PPA}" ] ; then if [ -n "${NGCP_PPA}" ] ; then
local ppa_tmp_packages local ppa_tmp_packages
ppa_tmp_packages=$(mktemp) ppa_tmp_packages=$(mktemp -t ngcp-deployment-installer-path.XXXXXXXXXX)
echo "NGCP PPA requested, checking ngcp-installer package availability in PPA repo" echo "NGCP PPA requested, checking ngcp-installer package availability in PPA repo"
local ppa_repos_base_path="${SIPWISE_URL}/autobuild/dists/${NGCP_PPA}/main/binary-amd64/" local ppa_repos_base_path="${SIPWISE_URL}/autobuild/dists/${NGCP_PPA}/main/binary-amd64/"

@ -11,7 +11,7 @@ prompt_for_raid() {
echo "${i}" "${disk_info}" off echo "${i}" "${disk_info}" off
done) ) done) )
local TMP local TMP
TMP=$(mktemp) TMP=$(mktemp -t ngcp-deployment-raid-prompt.XXXXXXXXXX)
if ! dialog --title "Disk selection for Software RAID" --separate-output \ if ! dialog --title "Disk selection for Software RAID" --separate-output \
--checklist "Please select the disks you would like to use for your RAID1:" 0 0 0 \ --checklist "Please select the disks you would like to use for your RAID1:" 0 0 0 \
"${DISK_LIST[@]}" 2>"${TMP}" ; then "${DISK_LIST[@]}" 2>"${TMP}" ; then
@ -36,7 +36,7 @@ prompt_for_target() {
done) ) done) )
local TMP local TMP
TMP=$(mktemp) TMP=$(mktemp -t ngcp-deployment-target-prompt.XXXXXXXXXX)
if ! dialog --title "Disk selection" --single-quoted \ if ! dialog --title "Disk selection" --single-quoted \
--ok-label OK --cancel-label Exit \ --ok-label OK --cancel-label Exit \
--menu "Please select the target disk for installing Debian/ngcp:" 0 0 0 \ --menu "Please select the target disk for installing Debian/ngcp:" 0 0 0 \

Loading…
Cancel
Save