diff options
| author | rmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d> | 2013-05-08 08:58:37 +0000 |
|---|---|---|
| committer | rmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d> | 2013-05-08 08:58:37 +0000 |
| commit | bc93d08c1f443264f5be4c71b2ddad0c00179507 (patch) | |
| tree | 64a507523b9bf902fcb2071b5358532ece52fc5b | |
| parent | d7cd6e6a142eea327fb98779a538111ccdab59a3 (diff) | |
Integrated patch from H.Merijn Brand to make Debian users happy(er).
git-svn-id: svn://svn.code.sf.net/p/dist/code/trunk/dist@164 2592e710-e01b-42a5-8df0-11608a6cc53d
| -rw-r--r-- | mcon/U/cf_email.U | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mcon/U/cf_email.U b/mcon/U/cf_email.U index 65c8329..311b050 100644 --- a/mcon/U/cf_email.U +++ b/mcon/U/cf_email.U @@ -13,7 +13,7 @@ ?RCS: patch16: created ?RCS: ?RCS: -?MAKE:cf_email: cat cf_by myhostname mydomain Oldconfig Myread +?MAKE:cf_email: cat cf_by test myhostname mydomain Oldconfig Myread ?MAKE: -pick add $@ %< ?S:cf_email: ?S: Electronic mail address of the person who ran Configure. This can be @@ -34,7 +34,13 @@ EOM cont=x while test "$cont"; do case "$MAILDOMAIN" in - '') maildomain="$myhostname$mydomain";; + '') + if $test -s /etc/mailname; then + maildomain=`$cat /etc/mailname` + else + maildomain="$myhostname$mydomain" + fi + ;; *) maildomain="$MAILDOMAIN";; esac case "$cf_email" in |