瀏覽代碼

Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

andryyy 8 年之前
父節點
當前提交
907f02fd06
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      generate_config.sh

+ 1 - 1
generate_config.sh

@@ -16,7 +16,7 @@ if [ -z "$MAILCOW_HOSTNAME" ]; then
   read -p "Hostname (FQDN): " -ei "mx.example.org" MAILCOW_HOSTNAME
   read -p "Hostname (FQDN): " -ei "mx.example.org" MAILCOW_HOSTNAME
 fi
 fi
 
 
-[[ -a /etc/timezone ]] && TZ=$(cat /etc/timezone)
+[[ -a /etc/timezone ]] && TZ=$(cat /etc/timezone) || [[ -a /etc/localtime ]] && TZ=$(readlink /etc/localtime|sed -n 's|^.*zoneinfo/||p')
 if [ -z "$TZ" ]; then
 if [ -z "$TZ" ]; then
   read -p "Timezone: " -ei "Europe/Berlin" TZ
   read -p "Timezone: " -ei "Europe/Berlin" TZ
 else
 else