Skip to content

Commit

Permalink
Merge pull request #279 from 42ity/jimklimov-env-domains
Browse files Browse the repository at this point in the history
Fix domain processing in envvars-ExecStartPre.sh.in
  • Loading branch information
EldoreiJK committed Jun 29, 2018
2 parents f29c726 + da63287 commit fdf2271
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/envvars-ExecStartPre.sh.in
@@ -1,7 +1,7 @@
#!/bin/bash

#
# Copyright (C) 2014-2017 Eaton
# Copyright (C) 2014-2018 Eaton
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -138,7 +138,7 @@ unset IFS_OLD
# A comma-separated list of domain names (if any) that can be part of
# this machine's FQDN when coupled with the hostname above. Note that
# generally definition of "domain" is domain-dependent (pun intended).
ENV_KNOWNDOMAINS="$(echo $ENV_DOMAINNAME $ENV_DNSDOMAINNAME $ENV_RESOLVDOMAINS | sort -n | uniq | tr '\n' ',' | sed 's/,$//')"
ENV_KNOWNDOMAINS="$(echo $ENV_DOMAINNAME $ENV_DNSDOMAINNAME $ENV_RESOLVDOMAINS | tr ' ' '\n' | sort -n | uniq | tr '\n' ',' | sed 's/,$//')"

list_hostnames_raw() {
# Map known "this-host" IP addresses to known hostnames
Expand Down

0 comments on commit fdf2271

Please sign in to comment.