summaryrefslogtreecommitdiffstats
path: root/remote
diff options
context:
space:
mode:
authorSimon Rettberg2013-09-18 16:54:58 +0200
committerJonathan Bauer2013-09-30 13:26:31 +0200
commite1bf73318c437425301e77b5a2e1dd66bb1268c6 (patch)
tree31e913c6379d8f08c4480883d56ff81b745a92aa /remote
parent[rootfs-stage32] Remove libau because it's not there and I have no clue what ... (diff)
downloadtm-scripts-e1bf73318c437425301e77b5a2e1dd66bb1268c6.tar.gz
tm-scripts-e1bf73318c437425301e77b5a2e1dd66bb1268c6.tar.xz
tm-scripts-e1bf73318c437425301e77b5a2e1dd66bb1268c6.zip
[rootfs-stage32] Tweak startup order (systemd)
Diffstat (limited to 'remote')
-rw-r--r--remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service3
-rw-r--r--remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-slx-addon@.service1
-rwxr-xr-xremote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons6
3 files changed, 6 insertions, 4 deletions
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service
index 4e663d56..df075922 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service
@@ -1,7 +1,8 @@
[Unit]
Description=Setup local disk partitions (tmp, swap)
DefaultDependencies=no
-Before=sysinit.target shutdown.target
+Before=sysinit.target
+After=systemd-udev-trigger.service
Wants=sysinit.target
[Service]
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-slx-addon@.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-slx-addon@.service
index 20909813..d7ec53c2 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-slx-addon@.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-slx-addon@.service
@@ -1,5 +1,6 @@
[Unit]
Description=Setup SLX addon %i
+DefaultDependencies=no
[Service]
Type=oneshot
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
index 661beac4..b5e2040b 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
@@ -41,9 +41,9 @@ mkdir -p "$SYS_TMP" || { echo "Failed to create $SYS_TMP"; exit 1; }
# NO ARGUMENTS -> LOOP OVER ALL ADDONS
#
-if [ $# == 0 ]; then
+if [ $# -eq 0 ]; then
for ADDON in ${SLX_ADDONS}; do
- systemctl start setup-slx-addon@$ADDON
+ systemctl start "setup-slx-addon@$ADDON" &
done
fi
@@ -52,7 +52,7 @@ fi
# WITH ARGUMENTS -> SETUP ADDON
#
-if [ $# == 1 ]; then
+if [ $# -eq 1 ]; then
ADDON="$1"
# sanity check