summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO6
-rw-r--r--src/load-fragment.c9
2 files changed, 7 insertions, 8 deletions
diff --git a/TODO b/TODO
index 2070a74913..80faf0fa3f 100644
--- a/TODO
+++ b/TODO
@@ -36,12 +36,6 @@ Features:
* use pivot_root on shutdown so that we can unmount the root directory.
-* make sure multiple sockets in a .socket file appear in the order they are listed
- currently we get:
- [Socket]
- ListenSequentialPacket=@/org/kernel/udev/udevd --> 4
- ListenNetlink=kobject-uevent 1 --> 3
-
* fix alsa mixer restore to not print error when no config is stored
* show enablement status in systemctl status
diff --git a/src/load-fragment.c b/src/load-fragment.c
index a7e16ca1b9..c48d764a31 100644
--- a/src/load-fragment.c
+++ b/src/load-fragment.c
@@ -198,7 +198,7 @@ static int config_parse_listen(
void *data,
void *userdata) {
- SocketPort *p;
+ SocketPort *p, *tail;
Socket *s;
assert(filename);
@@ -255,7 +255,12 @@ static int config_parse_listen(
}
p->fd = -1;
- LIST_PREPEND(SocketPort, port, s->ports, p);
+
+ if (s->ports) {
+ LIST_FIND_TAIL(SocketPort, port, s->ports, tail);
+ LIST_INSERT_AFTER(SocketPort, port, s->ports, tail, p);
+ } else
+ LIST_PREPEND(SocketPort, port, s->ports, p);
return 0;
}