diff --git a/usr/bin/archboot-tarball-helper.sh b/usr/bin/archboot-tarball-helper.sh index 2e0b83941..27c804914 100755 --- a/usr/bin/archboot-tarball-helper.sh +++ b/usr/bin/archboot-tarball-helper.sh @@ -4,7 +4,7 @@ APPNAME=$(basename "${0}") CONFIG="" TARNAME="" -export TEMPDIR=$(mktemp -d /tmp/tarball-helper.XXXX) +export TEMPDIR=$(mktemp -d /var/tmp/tarball-helper.XXXX) usage () { @@ -46,8 +46,8 @@ export RUNPROGRAM="${APPNAME}" export BOOTDIRNAME="boot/syslinux" export USEKERNEL="${VERSION}" -[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) -[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) +[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /var/tmp/bootmessage.XXXX) +[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /var/tmp/optionsbootmessage.XXXX) # begin script mkdir -p "${TEMPDIR}/${BOOTDIRNAME}/" @@ -85,5 +85,5 @@ if ! [ "${TARNAME}" = "" ]; then [ -e ${TARNAME} ] && rm ${TARNAME} tar cfv ${TARNAME} ${TEMPDIR} > /dev/null 2>&1 && echo ":: tar Image succesfull created at ${TARNAME}" fi -# clean /tmp +# clean /var/tmp rm -r ${TEMPDIR} diff --git a/usr/bin/archboot-uefi-cd.sh b/usr/bin/archboot-uefi-cd.sh index b4610befe..02c2df4e9 100755 --- a/usr/bin/archboot-uefi-cd.sh +++ b/usr/bin/archboot-uefi-cd.sh @@ -49,7 +49,7 @@ MOUNT_FSIMG=$(mktemp -d) ## Extract old ISO bsdtar -C "${ISOIMG}" -xf "${INPUT_IMAGENAME}" -# 7z x -o /tmp/ARCHBOOTISO/ "${INPUT_IMAGENAME}" +# 7z x -o /var/tmp/ARCHBOOTISO/ "${INPUT_IMAGENAME}" ## Copy UEFI files mkdir "${TEMP_DIR}"/boot @@ -107,12 +107,12 @@ xorriso -as mkisofs \ -eltorito-alt-boot -e CDEFI/cdefiboot.img -isohybrid-gpt-basdat \ -no-emul-boot \ -isohybrid-mbr "${ISOIMG}"/boot/syslinux/isohdpfx.bin \ - -output "${OUTPUT_IMAGENAME}" "${ISOIMG}"/ &> /tmp/xorriso.log + -output "${OUTPUT_IMAGENAME}" "${ISOIMG}"/ &> /var/tmp/xorriso.log if [[ -e "${OUTPUT_IMAGENAME}" ]]; then echo "Updated ISO at "${OUTPUT_IMAGENAME}"" else - echo "ISO generation failed. See /tmp/xorriso.log for more info." + echo "ISO generation failed. See /var/tmp/xorriso.log for more info." fi ## Delete old ISO extracted files diff --git a/usr/bin/archboot-update-iso.sh b/usr/bin/archboot-update-iso.sh index 5ec9fb775..af8d8392a 100755 --- a/usr/bin/archboot-update-iso.sh +++ b/usr/bin/archboot-update-iso.sh @@ -45,7 +45,7 @@ _ARCHBOOT_ISO_OLD_PATH="${1}" _ARCHBOOT_ISO_WD="$(dirname "${_ARCHBOOT_ISO_OLD_PATH}")" _ARCHBOOT_ISO_OLD_NAME="$(basename "${_ARCHBOOT_ISO_OLD_PATH}" | sed 's|\.iso||g')" -_ARCHBOOT_ISO_EXT_DIR="$(mktemp -d /tmp/archboot_iso_ext.XXXXXXXXXX)" +_ARCHBOOT_ISO_EXT_DIR="$(mktemp -d /var/tmp/archboot_iso_ext.XXXXXXXXXX)" ############################# @@ -319,8 +319,8 @@ _update_uefi_X64_GRUB_USB_files() { rm -f "${_ARCHBOOT_ISO_EXT_DIR}/EFI/grub/grubx64.cfg" || true echo - echo 'configfile ${cmdpath}/grubx64.cfg' > /tmp/grubx64.cfg - grub-mkstandalone -d /usr/lib/grub/x86_64-efi/ -O x86_64-efi --modules="part_gpt part_msdos" --fonts="unicode" --locales="en@quot" --themes="" -o "${_ARCHBOOT_ISO_EXT_DIR}/EFI/grub/grubx64.efi" "boot/grub/grub.cfg=/tmp/grubx64.cfg" -v + echo 'configfile ${cmdpath}/grubx64.cfg' > /var/tmp/grubx64.cfg + grub-mkstandalone -d /usr/lib/grub/x86_64-efi/ -O x86_64-efi --modules="part_gpt part_msdos" --fonts="unicode" --locales="en@quot" --themes="" -o "${_ARCHBOOT_ISO_EXT_DIR}/EFI/grub/grubx64.efi" "boot/grub/grub.cfg=/var/tmp/grubx64.cfg" -v cat << GRUBEOF > "${_ARCHBOOT_ISO_EXT_DIR}/EFI/grub/grubx64.cfg" insmod part_gpt @@ -375,8 +375,8 @@ _update_uefi_IA32_GRUB_USB_files() { rm -f "${_ARCHBOOT_ISO_EXT_DIR}/EFI/BOOT/bootia32.cfg" || true echo - echo 'configfile ${cmdpath}/bootia32.cfg' > /tmp/bootia32.cfg - grub-mkstandalone -d /usr/lib/grub/i386-efi/ -O i386-efi --modules="part_gpt part_msdos" --fonts="unicode" --locales="en@quot" --themes="" -o "${_ARCHBOOT_ISO_EXT_DIR}/EFI/BOOT/BOOTIA32.EFI" "boot/grub/grub.cfg=/tmp/bootia32.cfg" -v + echo 'configfile ${cmdpath}/bootia32.cfg' > /var/tmp/bootia32.cfg + grub-mkstandalone -d /usr/lib/grub/i386-efi/ -O i386-efi --modules="part_gpt part_msdos" --fonts="unicode" --locales="en@quot" --themes="" -o "${_ARCHBOOT_ISO_EXT_DIR}/EFI/BOOT/BOOTIA32.EFI" "boot/grub/grub.cfg=/var/tmp/bootia32.cfg" -v cat << GRUBEOF > "${_ARCHBOOT_ISO_EXT_DIR}/EFI/BOOT/bootia32.cfg" insmod part_gpt @@ -489,7 +489,7 @@ _remove_packages() { _update_arch_setup_initramfs() { - _initramfs_ext="$(mktemp -d /tmp/${_initramfs_name}_ext.XXXXXXXXXX)" + _initramfs_ext="$(mktemp -d /var/tmp/${_initramfs_name}_ext.XXXXXXXXXX)" echo cd "${_initramfs_ext}/" @@ -647,7 +647,7 @@ xorriso -as mkisofs \ -no-emul-boot -boot-load-size 4 -boot-info-table \ -isohybrid-mbr /usr/lib/syslinux/bios/isohdpfx.bin \ ${_CD_UEFI_PARAMETERS} \ - -output "${_ARCHBOOT_ISO_UPDATED_PATH}" "${_ARCHBOOT_ISO_EXT_DIR}/" &> "/tmp/archboot_update_xorriso.log" + -output "${_ARCHBOOT_ISO_UPDATED_PATH}" "${_ARCHBOOT_ISO_EXT_DIR}/" &> "/var/tmp/archboot_update_xorriso.log" echo set +x diff --git a/usr/bin/archboot-x86_64-iso.sh b/usr/bin/archboot-x86_64-iso.sh index c16d99f37..fb0d67671 100755 --- a/usr/bin/archboot-x86_64-iso.sh +++ b/usr/bin/archboot-x86_64-iso.sh @@ -81,7 +81,7 @@ if [[ "${_DO_x86_64}" == "1" ]]; then IMAGENAME="${IMAGENAME}-x86_64" fi -X86_64="$(mktemp -d /tmp/X86_64.XXX)" +X86_64="$(mktemp -d /var/tmp/X86_64.XXX)" # create directories mkdir -p "${X86_64}/arch" @@ -91,13 +91,13 @@ mkdir -p "${X86_64}/packages/" _merge_initramfs_files() { if [[ "${_DO_x86_64}" == "1" ]]; then - mkdir -p "${CORE64}/tmp/initrd" - cd "${CORE64}/tmp/initrd" + mkdir -p "${CORE64}/var/tmp/initrd" + cd "${CORE64}/var/tmp/initrd" - bsdtar xf "${CORE64}/tmp"/*/boot/initrd.img + bsdtar xf "${CORE64}/var/tmp"/*/boot/initrd.img - cd "${CORE64}/tmp/initrd" - find . -print0 | bsdcpio -0oH newc | lzma > "${CORE64}/tmp/initramfs_x86_64.img" + cd "${CORE64}/var/tmp/initrd" + find . -print0 | bsdcpio -0oH newc | lzma > "${CORE64}/var/tmp/initramfs_x86_64.img" fi cd "${WD}/" @@ -107,34 +107,34 @@ _merge_initramfs_files() { _prepare_kernel_initramfs_files() { if [[ "${_DO_x86_64}" == "1" ]]; then - mv "${CORE64}/tmp"/*/boot/vmlinuz "${X86_64}/boot/vmlinuz_x86_64" - mv "${CORE64}/tmp/initramfs_x86_64.img" "${X86_64}/boot/initramfs_x86_64.img" + mv "${CORE64}/var/tmp"/*/boot/vmlinuz "${X86_64}/boot/vmlinuz_x86_64" + mv "${CORE64}/var/tmp/initramfs_x86_64.img" "${X86_64}/boot/initramfs_x86_64.img" fi - mv "${CORE64}/tmp"/*/boot/memtest "${X86_64}/boot/memtest" - mv "${CORE64}/tmp"/*/boot/intel-ucode.img "${X86_64}/boot/intel-ucode.img" - mv "${CORE64}/tmp"/*/boot/amd-ucode.img "${X86_64}/boot/amd-ucode.img" + mv "${CORE64}/var/tmp"/*/boot/memtest "${X86_64}/boot/memtest" + mv "${CORE64}/var/tmp"/*/boot/intel-ucode.img "${X86_64}/boot/intel-ucode.img" + mv "${CORE64}/var/tmp"/*/boot/amd-ucode.img "${X86_64}/boot/amd-ucode.img" } _prepare_packages() { - PACKAGES_TEMP_DIR="$(mktemp -d /tmp/pkgs_temp.XXX)" + PACKAGES_TEMP_DIR="$(mktemp -d /var/tmp/pkgs_temp.XXX)" if [[ "${_DO_x86_64}" == "1" ]]; then - CORE64="$(mktemp -d /tmp/core64.XXX)" + CORE64="$(mktemp -d /var/tmp/core64.XXX)" tar xvf core-x86_64.tar -C "${CORE64}" || exit 1 - cp -rf "${CORE64}/tmp"/*/core-x86_64 "${PACKAGES_TEMP_DIR}/core-x86_64" - rm -rf "${CORE64}/tmp"/*/core-x86_64 + cp -rf "${CORE64}/var/tmp"/*/core-x86_64 "${PACKAGES_TEMP_DIR}/core-x86_64" + rm -rf "${CORE64}/var/tmp"/*/core-x86_64 mksquashfs "${PACKAGES_TEMP_DIR}/core-x86_64/" "${PACKAGES_TEMP_DIR}/archboot_packages_x86_64.squashfs" -comp xz -noappend -all-root mv "${PACKAGES_TEMP_DIR}/archboot_packages_x86_64.squashfs" "${X86_64}/packages/" fi # move in 'any' packages - cp -rf "${CORE64}/tmp"/*/core-any "${PACKAGES_TEMP_DIR}/core-any" - rm -rf "${CORE64}/tmp"/*/core-any + cp -rf "${CORE64}/var/tmp"/*/core-any "${PACKAGES_TEMP_DIR}/core-any" + rm -rf "${CORE64}/var/tmp"/*/core-any mksquashfs "${PACKAGES_TEMP_DIR}/core-any/" "${PACKAGES_TEMP_DIR}/archboot_packages_any.squashfs" -comp xz -noappend -all-root cd "${WD}/" @@ -146,7 +146,7 @@ _prepare_other_files() { # move in doc mkdir -p "${X86_64}/arch/" - mv "${CORE64}/tmp"/*/arch/archboot.txt "${X86_64}/arch/" + mv "${CORE64}/var/tmp"/*/arch/archboot.txt "${X86_64}/arch/" } @@ -216,8 +216,8 @@ _prepare_uefi_X64_GRUB_USB_files() { mkdir -p "${X86_64}/EFI/grub" - echo 'configfile ${cmdpath}/grubx64.cfg' > /tmp/grubx64.cfg - grub-mkstandalone -d /usr/lib/grub/x86_64-efi/ -O x86_64-efi --modules="part_gpt part_msdos" --fonts="unicode" --locales="en@quot" --themes="" -o "${X86_64}/EFI/grub/grubx64.efi" "boot/grub/grub.cfg=/tmp/grubx64.cfg" -v + echo 'configfile ${cmdpath}/grubx64.cfg' > /var/tmp/grubx64.cfg + grub-mkstandalone -d /usr/lib/grub/x86_64-efi/ -O x86_64-efi --modules="part_gpt part_msdos" --fonts="unicode" --locales="en@quot" --themes="" -o "${X86_64}/EFI/grub/grubx64.efi" "boot/grub/grub.cfg=/var/tmp/grubx64.cfg" -v cat << GRUBEOF > "${X86_64}/EFI/grub/grubx64.cfg" insmod part_gpt @@ -269,8 +269,8 @@ _prepare_uefi_IA32_GRUB_USB_files() { mkdir -p "${X86_64}/EFI/BOOT" - echo 'configfile ${cmdpath}/bootia32.cfg' > /tmp/bootia32.cfg - grub-mkstandalone -d /usr/lib/grub/i386-efi/ -O i386-efi --modules="part_gpt part_msdos" --fonts="unicode" --locales="en@quot" --themes="" -o "${X86_64}/EFI/BOOT/BOOTIA32.EFI" "boot/grub/grub.cfg=/tmp/bootia32.cfg" -v + echo 'configfile ${cmdpath}/bootia32.cfg' > /var/tmp/bootia32.cfg + grub-mkstandalone -d /usr/lib/grub/i386-efi/ -O i386-efi --modules="part_gpt part_msdos" --fonts="unicode" --locales="en@quot" --themes="" -o "${X86_64}/EFI/BOOT/BOOTIA32.EFI" "boot/grub/grub.cfg=/var/tmp/bootia32.cfg" -v cat << GRUBEOF > "${X86_64}/EFI/BOOT/bootia32.cfg" insmod part_gpt @@ -370,7 +370,7 @@ _prepare_uefi_IA32_GRUB_USB_files # _prepare_uefi_IA32_syslinux_USB_files # place syslinux files -mv "${CORE64}/tmp"/*/boot/syslinux/* "${X86_64}/boot/syslinux/" +mv "${CORE64}/var/tmp"/*/boot/syslinux/* "${X86_64}/boot/syslinux/" # Change parameters in boot.msg sed -i -e "s/@@DATE@@/$(date)/g" -e "s/@@KERNEL@@/$KERNEL/g" -e "s/@@RELEASENAME@@/$RELEASENAME/g" -e "s/@@BOOTLOADER@@/ISOLINUX/g" "${X86_64}/boot/syslinux/boot.msg" @@ -388,7 +388,7 @@ xorriso -as mkisofs \ -eltorito-catalog boot/syslinux/boot.cat \ -no-emul-boot -boot-load-size 4 -boot-info-table \ -isohybrid-mbr /usr/lib/syslinux/bios/isohdpfx.bin \ - -output "${IMAGENAME}.iso" "${X86_64}/" &> "/tmp/archboot_allinone_xorriso.log" + -output "${IMAGENAME}.iso" "${X86_64}/" &> "/var/tmp/archboot_allinone_xorriso.log" # create x86_64 iso with uefi cd boot support, if not present if [[ -e "${WD}/${IMAGENAME}.iso" ]] && [[ ! -e "${WD}/${IMAGENAME}-uefi.iso" ]]; then diff --git a/usr/bin/rsync-backup.sh b/usr/bin/rsync-backup.sh index dff10d50a..fdde5a644 100755 --- a/usr/bin/rsync-backup.sh +++ b/usr/bin/rsync-backup.sh @@ -12,7 +12,7 @@ usage() echo "" echo "- For system backup start with full mounted system and then invoke this script" echo " with system's root directory as backupdir." - echo " - excluded directories are /dev /tmp /proc /sys /run /mnt /media /lost+found" + echo " - excluded directories are /dev /var/tmp /proc /sys /run /mnt /media /lost+found" echo " - --numeric-ids option is invoked to preserve users" echo "" echo "usage: ${APPNAME} " @@ -28,5 +28,5 @@ fi BACKUPDESTINATION="${2}" BACKUPDIR="${1}" -rsync -aAXv --numeric-ids --exclude={"/dev/*","/proc/*","/sys/*","/tmp/*","/run/*","/mnt/*","/media/*","/lost+found"} $BACKUPDIR $BACKUPDESTINATION +rsync -aAXv --numeric-ids --exclude={"/dev/*","/proc/*","/sys/*","/var/tmp/*","/run/*","/mnt/*","/media/*","/lost+found"} $BACKUPDIR $BACKUPDESTINATION