Masato Taruishi
taru****@users*****
2004年 10月 13日 (水) 15:56:41 JST
=================================================================== RCS file: ultrapossum/init.d/15variable,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ultrapossum/init.d/15variable 2004/10/13 06:21:36 1.12 +++ ultrapossum/init.d/15variable 2004/10/13 06:56:41 1.13 @@ -4,11 +4,9 @@ HOST="`hostname`" if test "$UNAME" = "Linux"; then - FQDN="`hostname --fqdn`" DOMAIN=$(ultrapossum_getconf DOMAIN "`hostname -d`") else - FQDN=$HOST - DOMAIN="" + DOMAIN=$(ultrapossum_getconf DOMAIN "") fi DBNAME=`ultrapossum_getconf DBNAME ultrapossum` =================================================================== RCS file: ultrapossum/init.d/30logical,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ultrapossum/init.d/30logical 2004/10/07 09:53:40 1.4 +++ ultrapossum/init.d/30logical 2004/10/13 06:56:41 1.5 @@ -11,3 +11,13 @@ fi fi +if test "$UNAME" = "Linux"; then + FQDN="`hostname --fqdn`" +else + if test "x$DOMAIN" = "x"; then + FQDN="$HOST" + else + FQDN="$HOST.$DOMAIN" + fi +fi +
