2 files changed, 18 insertions, 7 deletions
diff --git a/src/systemd/vyos-net-name-resolve-hotplug.service b/src/systemd/vyos-net-name-resolve-hotplug.service
new file mode 100644
index 000000000..d52fc6061
--- /dev/null
+++ b/src/systemd/vyos-net-name-resolve-hotplug.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=VyOS persistent interface naming for hot-plugged hardware
+
+# Pulled in by 60-vyos-net-hotplug.rules when a network device appears.
+# Held off until the boot-time configuration has been applied, otherwise the
+# boot storm of "add" events would each queue a redundant run.
+ConditionPathExists=/tmp/vyos-config-status
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/vyos/system/vyos-net-name-resolve.py --hotplug
+TimeoutStartSec=90
+StandardOutput=journal
diff --git a/src/systemd/vyos-net-name-resolve.service b/src/systemd/vyos-net-name-resolve.service
index ec7c45636..8ad1c3418 100644
--- a/src/systemd/vyos-net-name-resolve.service
+++ b/src/systemd/vyos-net-name-resolve.service
@@ -1,17 +1,15 @@
 [Unit]
-Description=VyOS deterministic hw-id based interface naming
+Description=VyOS persistent interface naming
 Documentation=man:vyos-net-name-resolve.py(8)
 
-# Started explicitly by vyos-router (like frr.service/vyos-netlinkd.service)
-# once /opt/vyatta/etc/config is mounted and config.boot exists - which, for
-# an encrypted config volume, only happens after vyos-router has unlocked
-# and mounted it. It cannot be ordered independently before vyos-router:
-# there is no config.boot to read before that point.
+# Started by vyos-router once the config directory is mounted - for an
+# encrypted volume that is only after it has been unlocked - so this can not
+# be ordered independently. This is the boot pass; hot-plugged hardware is
+# named by vyos-net-name-resolve-hotplug.service, which passes --hotplug.
 DefaultDependencies=no
 
 [Service]
 Type=oneshot
-RemainAfterExit=yes
 ExecStart=/usr/libexec/vyos/system/vyos-net-name-resolve.py
 TimeoutStartSec=90
 StandardOutput=journal+console