Masato Taruishi
taru****@users*****
2004年 10月 13日 (水) 15:21:36 JST
===================================================================
RCS file: ultrapossum/init.d/10compat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ultrapossum/init.d/10compat 2004/09/15 12:17:50 1.1
+++ ultrapossum/init.d/10compat 2004/10/13 06:21:36 1.2
@@ -1,5 +1,7 @@
### compat ###
+UNAME="`uname`"
+
if test -x "/bin/tempfile"; then
:
elif test -x "/bin/mktemp"; then
@@ -19,7 +21,7 @@
}
fi
-if test `uname` = "SunOS"; then
+if test "$UNAME" = "SunOS"; then
sed() {
tmpsed=`tempfile`
===================================================================
RCS file: ultrapossum/init.d/15variable,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/init.d/15variable 2004/10/09 14:49:23 1.11
+++ ultrapossum/init.d/15variable 2004/10/13 06:21:36 1.12
@@ -3,6 +3,13 @@
if test "x$cache" = "x"; then
HOST="`hostname`"
+if test "$UNAME" = "Linux"; then
+ FQDN="`hostname --fqdn`"
+ DOMAIN=$(ultrapossum_getconf DOMAIN "`hostname -d`")
+else
+ FQDN=$HOST
+ DOMAIN=""
+fi
DBNAME=`ultrapossum_getconf DBNAME ultrapossum`
ORGANIZATION=`ultrapossum_getconf ORGANIZATION $HOST`