summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSimon Rettberg2022-07-11 17:39:08 +0200
committerSimon Rettberg2022-07-11 17:39:08 +0200
commitb1c5ea61d2154288c103be449111a32462c53d64 (patch)
tree493c00337cc32685b9b9f55667acb792182a0f3f /core
parent[vmware-common] Force mainMem swap backing even if we don't have swap (diff)
downloadmltk-b1c5ea61d2154288c103be449111a32462c53d64.tar.gz
mltk-b1c5ea61d2154288c103be449111a32462c53d64.tar.xz
mltk-b1c5ea61d2154288c103be449111a32462c53d64.zip
[rfs-stage32] Make sure we mount tmp before tmpfiles-setup
Diffstat (limited to 'core')
-rwxr-xr-xcore/modules/disk-partitions/data/opt/openslx/scripts/systemd-setup_partitions4
-rw-r--r--core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-temp.service2
2 files changed, 4 insertions, 2 deletions
diff --git a/core/modules/disk-partitions/data/opt/openslx/scripts/systemd-setup_partitions b/core/modules/disk-partitions/data/opt/openslx/scripts/systemd-setup_partitions
index 3294a9cd..f87bb1d8 100755
--- a/core/modules/disk-partitions/data/opt/openslx/scripts/systemd-setup_partitions
+++ b/core/modules/disk-partitions/data/opt/openslx/scripts/systemd-setup_partitions
@@ -29,7 +29,9 @@ mkdir -p "/run/openslx"
. /opt/openslx/bin/slx-tools
dev_find_partitions &> /dev/null # Preload function
-# Check what to do
+# Check what to do. Currently triggered by:
+# setup-partitions.service (Mini and Maxi, for swap, linux, persistent)
+# setup-temp.service (Mini only, for ID44 /tmp)
while (( $# > 0 )); do
case "$1" in
--tmp) DO_TMP=1 ;;
diff --git a/core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-temp.service b/core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-temp.service
index 36bd9c2a..1d589cae 100644
--- a/core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-temp.service
+++ b/core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-temp.service
@@ -1,7 +1,7 @@
[Unit]
Description=Setup ID 44 /tmp
DefaultDependencies=no
-Before=basic.target tmp.target
+Before=basic.target tmp.target systemd-tmpfiles-setup.service
After=systemd-udev-settle.service systemd-udevd.service
Wants=tmp.target systemd-udevd.service