1. diff --git a/system/systemd/plugin.d/systemd.plugin b/system/systemd/plugin.d/systemd.plugin
2. index bda5f68..e319e1f 100644
3. --- a/system/systemd/plugin.d/systemd.plugin
4. +++ b/system/systemd/plugin.d/systemd.plugin
5. @@ -20,9 +20,12 @@ plugin_systemd_configure()
6.  
7.    if [ -d $SCRIPT_DIRECTORY/systemd.d ]; then
8.      cd $SCRIPT_DIRECTORY/systemd.d
9. -
10.      SERVICES=$(ls -1)
11. +  elif [ -n "$SYSTEMD_UNITS" ]; then
12. +    SERVICES=$SYSTEMD_UNITS
13. +  fi
14.  
15. +  if [ -n "$SERVICES" ]; then
16.      for SERVICE in $SERVICES; do
17.        # don't ask for '@' services - these should always be installed but
18.        # never linked directly. Also ask for new or renamed services.
19. @@ -34,7 +37,7 @@ plugin_systemd_configure()
20.               fi
21.          continue
22.        fi
23. -      message "${MESSAGE_COLOR}$SERVICE: $(grep Description= $SERVICE | cut -d= -f2-)${DEFAULT_COLOR}"
24. +      message "${MESSAGE_COLOR}$SERVICE: $([ -f $SERVICE ] && grep Description= $SERVICE | cut -d= -f2-)${DEFAULT_COLOR}"
25.        if query "Invoke $SERVICE via systemd automatically at boot ?"  y
26.        then
27.          SYSTEMD_SERVICES+=" $SERVICE"
28.