@@ -13,8 +13,7 @@ SRC_URI = "file://usr/bin/deploy-image-wic.sh \
"
DEPENDS:append:bookworm = " bmap-tools"
-DEPENDS:append = " systemd-tmpfs-tmp"
-DEBIAN_DEPENDS = "bmap-tools, pv, dialog, util-linux, parted, fdisk, gdisk, pigz, procps, systemd-tmpfs-tmp, xz-utils, pbzip2, zstd"
+DEBIAN_DEPENDS = "bmap-tools, pv, dialog, util-linux, parted, fdisk, gdisk, pigz, procps, xz-utils, pbzip2, zstd"
do_install[cleandirs] = "${D}/usr/bin/ \
${D}/usr/lib/deploy-image-wic \
"
@@ -11,12 +11,12 @@ SCRIPT_DIR=$( dirname -- "$( readlink -f -- "$0"; )"; )
. "${SCRIPT_DIR}/../lib/deploy-image-wic/handle-config.sh"
if [ "$installer_unattended" = true ] && [ "$installer_unattended_abort_enable" = true ]; then
- abort_file=/tmp/attended_mode_trigger
+ abort_file=/run/attended_mode_trigger
for ((i=$installer_unattended_abort_timeout; i>0; i--)); do
echo -ne "\rUnattended installation will start in $i seconds. Press any key to switch to attended mode..."
- # Switch to attended mode if the abort file exists or any key pressed during countdown
- # Create abort file to notify all other console instances to abort
+ # Switch to attended mode if the abort file exists or any key pressed during countdown
+ # Create abort file to notify all other console instances to abort
if [ -f "$abort_file" ] || read -n 1 -t 1; then
installer_unattended=false
touch "$abort_file"
deleted file mode 100644
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-DEST="/etc/systemd/system/tmp.mount"
-
-if [ ! -e "${DEST}" ]; then
- # Possible source paths for tmp.mount
- for SRC in /usr/share/systemd/tmp.mount /usr/lib/systemd/system/tmp.mount; do
- # If the source file exists, copy it to the destination and exit the loop
- [ -e "${SRC}" ] && cp ${SRC} ${DEST} && break
- done
-fi
-
-# Enable the mount unit using deb-systemd-helper; ignore errors if it fails
-deb-systemd-helper enable tmp.mount || true
deleted file mode 100644
@@ -1,13 +0,0 @@
-# This software is a part of Isar.
-# Copyright (C) Siemens AG, 2025
-#
-# SPDX-License-Identifier: MIT
-
-inherit dpkg-raw
-
-DESCRIPTION = "Configures /tmp as systemd-managed temporary filesystem (tmpfs), ensuring read-write access even if rootfs is read-only"
-MAINTAINER = "isar-users <isar-users@googlegroups.com>"
-
-SRC_URI = "file://postinst"
-
-DEBIAN_DEPENDS = "systemd"
Switch unattended abort trigger from /tmp to /run to rely on default tmpfs. Drop the systemd-tmpfs-tmp recipe and dependency, removing custom tmp.mount setup as it is no longer needed. Signed-off-by: Badrikesh Prusty <badrikesh.prusty@siemens.com> --- .../deploy-image/deploy-image_0.1.bb | 3 +-- .../files/usr/bin/deploy-image-wic.sh | 6 +++--- .../systemd-tmpfs-tmp/files/postinst | 16 ---------------- .../systemd-tmpfs-tmp/systemd-tmpfs-tmp_0.1.bb | 13 ------------- 4 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 meta-isar/recipes-installer/systemd-tmpfs-tmp/files/postinst delete mode 100644 meta-isar/recipes-installer/systemd-tmpfs-tmp/systemd-tmpfs-tmp_0.1.bb