- /* Try to find a name we can load this with */
- SET_FOREACH(t, u->meta.names, i)
- if ((r = load_from_path(u, t)) != 0)
- return r;
+ /* Try to find the unit under its id */
+ if ((t = unit_id(u)))
+ r = load_from_path(u, t);
+
+ /* Try to find an alias we can load this with */
+ if (r == 0)
+ SET_FOREACH(t, u->meta.names, i)
+ if ((r = load_from_path(u, t)) != 0)
+ break;