Updated all containers (the start order is set by the create script).

diff --git a/scripts/create-container.sh b/scripts/create-container.sh
index 720bb12175b8ac7af7ce7d3ee44f9742e78d9e64..5281af42d93be8a8d0f95bdf5ef83986153e9bbb 100755 (executable)
--- a/scripts/create-container.sh
+++ b/scripts/create-container.sh
@@ -70,6 +70,18 @@ CONTAINER_NAME="${CONTAINER_BASENAME}.$CONTAINER_OS"
 CONTAINER_PATH=$LXC_PATH/$CONTAINER_NAME
 CONTAINER_BUILD_PATH=$BUILD_PATH/$CONTAINER_NAME
 
+CONTAINER_START_ORDER=$(grep -w $CONTAINER_BASENAME $SOURCES_PATH/start-order.txt \
+                            | awk '{print $2}')
+
+################################################################
+# exit if the container does not have a start order            #
+################################################################
+if [ -z "$CONTAINER_START_ORDER" ]
+then
+    echo "The container does not have a start order." >&2
+    exit 1
+fi
+
 ################################################################
 # exit if the container build directory already exists         #
 ################################################################
@@ -133,6 +145,7 @@ mkdir --parents $CONTAINER_BUILD_PATH/rootfs
 echo "Creating container config and hooks."
 sed --expression="s|__CONTAINER_FILESYSTEMS_PATH__|$CONTAINER_FILESYSTEMS_PATH|" \
     --expression="s|__CONTAINER_PATH__|$CONTAINER_PATH|" \
+    --expression="s|__CONTAINER_START_ORDER__|$CONTAINER_START_ORDER|" \
     <$CONTAINER_SOURCE_PATH/config \
     >$CONTAINER_BUILD_PATH/config
 if [ -d $CONTAINER_SOURCE_PATH/hooks ]

diff --git a/sources/efg.pm/config b/sources/efg.pm/config
index e40602c30c13b4945c59e1b9d8bc927b1045913c..6850fab0247292a2b565cba94446138dcdc0b4f0 100644 (file)
--- a/sources/efg.pm/config
+++ b/sources/efg.pm/config
@@ -30,5 +30,5 @@ lxc.cgroup2.devices.allow = a
 lxc.signal.halt = SIGRTMIN+4
 
 lxc.start.auto = 1
-lxc.start.order = 1
-lxc.start.delay = 3
+lxc.start.order = __CONTAINER_START_ORDER__
+lxc.start.delay = 5

diff --git a/sources/ens.pm/config b/sources/ens.pm/config
index a9a178a58d74a0999337b67ba2eff88a7e9fdfaa..23f5aeb0b8516e42aa792d5ca5152dff0a58444c 100644 (file)
--- a/sources/ens.pm/config
+++ b/sources/ens.pm/config
@@ -17,5 +17,5 @@ lxc.cgroup2.devices.allow = a
 lxc.signal.halt = SIGRTMIN+4
 
 lxc.start.auto = 1
-lxc.start.order = 11
-lxc.start.delay = 3
+lxc.start.order = __CONTAINER_START_ORDER__
+lxc.start.delay = 5

diff --git a/sources/ifg.in/config b/sources/ifg.in/config
index b35852ae3253bfc6a8a57b182e8cc5e36c987e7e..c087d93614cf3bb6502137c02a872becbdbb9910 100644 (file)
--- a/sources/ifg.in/config
+++ b/sources/ifg.in/config
@@ -24,5 +24,5 @@ lxc.cgroup2.devices.allow = a
 lxc.signal.halt = SIGRTMIN+4
 
 lxc.start.auto = 1
-lxc.start.order = 2
-lxc.start.delay = 3
+lxc.start.order = __CONTAINER_START_ORDER__
+lxc.start.delay = 5

diff --git a/sources/ins.in/config b/sources/ins.in/config
index 67221434425427868a129c822896e390116d7a8d..0d401a176b7a42d4b8c29cc9d0f73876e975c5d1 100644 (file)
--- a/sources/ins.in/config
+++ b/sources/ins.in/config
@@ -17,5 +17,5 @@ lxc.cgroup2.devices.allow = a
 lxc.signal.halt = SIGRTMIN+4
 
 lxc.start.auto = 1
-lxc.start.order = 22
-lxc.start.delay = 3
+lxc.start.order = __CONTAINER_START_ORDER__
+lxc.start.delay = 5

diff --git a/sources/ldap.in/config b/sources/ldap.in/config
index 8c423087110b7ae3986a1a607bd5b5c65dc3c771..b7cfe0c312f274c09492424a4426a4a4ee8c53bb 100644 (file)
--- a/sources/ldap.in/config
+++ b/sources/ldap.in/config
@@ -17,5 +17,5 @@ lxc.cgroup2.devices.allow = a
 lxc.signal.halt = SIGRTMIN+4
 
 lxc.start.auto = 1
-lxc.start.order = 24
-lxc.start.delay = 3
+lxc.start.order = __CONTAINER_START_ORDER__
+lxc.start.delay = 5

diff --git a/sources/ls.in/config b/sources/ls.in/config
index b4ee723f3bf36d596d614238930d62f88218aaee..86dfcfd4e901bf208acc107bc81f89a0148e4d74 100644 (file)
--- a/sources/ls.in/config
+++ b/sources/ls.in/config
@@ -18,5 +18,5 @@ lxc.cgroup2.devices.allow = a
 lxc.signal.halt = SIGRTMIN+4
 
 lxc.start.auto = 1
-lxc.start.order = 22
-lxc.start.delay = 3
+lxc.start.order = __CONTAINER_START_ORDER__
+lxc.start.delay = 5

diff --git a/sources/pns.in/config b/sources/pns.in/config
index 5b49867c6d416807fcd7d73e824109f7e66202ee..3785a57925fe0d9235050277a3191e9d21e504cd 100644 (file)
--- a/sources/pns.in/config
+++ b/sources/pns.in/config
@@ -17,5 +17,5 @@ lxc.cgroup2.devices.allow = a
 lxc.signal.halt = SIGRTMIN+4
 
 lxc.start.auto = 1
-lxc.start.order = 21
-lxc.start.delay = 3
+lxc.start.order = __CONTAINER_START_ORDER__
+lxc.start.delay = 5

diff --git a/sources/pns.pm/config b/sources/pns.pm/config
index eb413d8d581900680a84495c8485589b76dd65f7..d4873bb8a73ff23e3ffc1ea20b225b08f7a7e967 100644 (file)
--- a/sources/pns.pm/config
+++ b/sources/pns.pm/config
@@ -17,5 +17,5 @@ lxc.cgroup2.devices.allow = a
 lxc.signal.halt = SIGRTMIN+4
 
 lxc.start.auto = 1
-lxc.start.order = 12
-lxc.start.delay = 3
+lxc.start.order = __CONTAINER_START_ORDER__
+lxc.start.delay = 5

diff --git a/sources/svc.in/config b/sources/svc.in/config
index d4c56cbfcfc741f8f6f35e5c516ec833c121445f..5b1e0143f95d83c66d0916c76194722c5489ad95 100644 (file)
--- a/sources/svc.in/config
+++ b/sources/svc.in/config
@@ -17,5 +17,5 @@ lxc.cgroup2.devices.allow = a
 lxc.signal.halt = SIGRTMIN+4
 
 lxc.start.auto = 1
-lxc.start.order = 23
-lxc.start.delay = 3
+lxc.start.order = __CONTAINER_START_ORDER__
+lxc.start.delay = 5

diff --git a/sources/vpn.in/config b/sources/vpn.in/config
index 54dab8197bc33f52c1a0b14060de7857f554498e..367c3381fde5b01af2a76dca88c4afb95a4210c8 100644 (file)
--- a/sources/vpn.in/config
+++ b/sources/vpn.in/config
@@ -18,5 +18,5 @@ lxc.cgroup2.devices.allow = a
 lxc.signal.halt = SIGRTMIN+4
 
 lxc.start.auto = 1
-lxc.start.order = 25
-lxc.start.delay = 3
+lxc.start.order = __CONTAINER_START_ORDER__
+lxc.start.delay = 5

diff --git a/sources/ws.pm/config b/sources/ws.pm/config
index d53dd9adfd2f39d3379bf650a2844c84be014d4e..e80216644900aa24b45419433679e03aa59387f3 100644 (file)
--- a/sources/ws.pm/config
+++ b/sources/ws.pm/config
@@ -21,5 +21,5 @@ lxc.cgroup2.devices.allow = a
 lxc.signal.halt = SIGRTMIN+4
 
 lxc.start.auto = 1
-lxc.start.order = 13
-lxc.start.delay = 3
+lxc.start.order = __CONTAINER_START_ORDER__
+lxc.start.delay = 5

diff --git a/sources/xfr.pm/config b/sources/xfr.pm/config
index bf2c2e0f171777f1a23d5aebaf1ec7157af32fd7..c7cfb7eddcdf653733b4cedc513b3b8f60d4e896 100644 (file)
--- a/sources/xfr.pm/config
+++ b/sources/xfr.pm/config
@@ -18,5 +18,5 @@ lxc.cgroup2.devices.allow = a
 lxc.signal.halt = SIGRTMIN+4
 
 lxc.start.auto = 1
-lxc.start.order = 14
-lxc.start.delay = 3
+lxc.start.order = __CONTAINER_START_ORDER__
+lxc.start.delay = 5