Blame bacula-5.2.6-hostname.patch
|
Simone Caronni |
114d5d |
diff -Naur bacula-5.2.6.old/autoconf/configure.in bacula-5.2.6/autoconf/configure.in
|
|
Simone Caronni |
114d5d |
--- bacula-5.2.6.old/autoconf/configure.in 2012-05-24 14:08:57.595272317 +0200
|
|
Simone Caronni |
114d5d |
+++ bacula-5.2.6/autoconf/configure.in 2012-05-24 14:11:20.313120159 +0200
|
|
Simone Caronni |
114d5d |
@@ -1264,6 +1264,11 @@
|
|
Simone Caronni |
114d5d |
if test x${hostname} = x ; then
|
|
Simone Caronni |
114d5d |
hostname="localhost"
|
|
Simone Caronni |
114d5d |
fi
|
|
Simone Caronni |
114d5d |
+dnl Make sure hostname is resolved
|
|
Simone Caronni |
114d5d |
+ping -c 1 $hostname 2>/dev/null 1>/dev/null
|
|
Simone Caronni |
114d5d |
+if test ! $? = 0; then
|
|
Simone Caronni |
114d5d |
+ hostname="localhost"
|
|
Simone Caronni |
114d5d |
+fi
|
|
Simone Caronni |
114d5d |
AC_ARG_WITH(hostname,
|
|
Simone Caronni |
114d5d |
AC_HELP_STRING([--with-hostname=RESNAME], [specify host name for daemons]),
|
|
Simone Caronni |
114d5d |
[
|
|
Simone Caronni |
114d5d |
@@ -2858,16 +2863,6 @@
|
|
Simone Caronni |
f45ba5 |
MACOSX=
|
|
Simone Caronni |
f45ba5 |
COMPRESS_MANPAGES=yes
|
|
Simone Caronni |
f45ba5 |
|
|
Simone Caronni |
f45ba5 |
-hostname=`uname -n | cut -d '.' -f 1`
|
|
Simone Caronni |
f45ba5 |
-if test x${hostname} = x ; then
|
|
Simone Caronni |
f45ba5 |
- hostname="localhost"
|
|
Simone Caronni |
f45ba5 |
-fi
|
|
Simone Caronni |
114d5d |
-dnl Make sure hostname is resolved
|
|
Simone Caronni |
f45ba5 |
-ping -c 1 $hostname 2>/dev/null 1>/dev/null
|
|
Simone Caronni |
f45ba5 |
-if test ! $? = 0; then
|
|
Simone Caronni |
f45ba5 |
- hostname="localhost"
|
|
Simone Caronni |
f45ba5 |
-fi
|
|
Simone Caronni |
f45ba5 |
-
|
|
Simone Caronni |
f45ba5 |
case "$DISTNAME" in
|
|
Simone Caronni |
f45ba5 |
aix)
|
|
Simone Caronni |
f45ba5 |
DISTVER=`uname -r`
|
|
Simone Caronni |
114d5d |
diff -Naur bacula-5.2.6.old/configure bacula-5.2.6/configure
|
|
Simone Caronni |
114d5d |
--- bacula-5.2.6.old/configure 2012-05-24 14:08:57.834277377 +0200
|
|
Simone Caronni |
114d5d |
+++ bacula-5.2.6/configure 2012-05-24 14:12:04.561861019 +0200
|
|
Simone Caronni |
114d5d |
@@ -23174,6 +23174,10 @@
|
|
Simone Caronni |
114d5d |
if test x${hostname} = x ; then
|
|
Simone Caronni |
114d5d |
hostname="localhost"
|
|
Simone Caronni |
114d5d |
fi
|
|
Simone Caronni |
114d5d |
+ping -c 1 $hostname 2>/dev/null 1>/dev/null
|
|
Simone Caronni |
114d5d |
+if test ! $? = 0; then
|
|
Simone Caronni |
114d5d |
+ hostname="localhost"
|
|
Simone Caronni |
114d5d |
+fi
|
|
Simone Caronni |
114d5d |
|
|
Simone Caronni |
114d5d |
# Check whether --with-hostname was given.
|
|
Simone Caronni |
114d5d |
if test "${with_hostname+set}" = set; then :
|
|
Simone Caronni |
114d5d |
@@ -30010,15 +30014,6 @@
|
|
Simone Caronni |
e0615f |
MACOSX=
|
|
Simone Caronni |
e0615f |
COMPRESS_MANPAGES=yes
|
|
Simone Caronni |
e0615f |
|
|
Simone Caronni |
e0615f |
-hostname=`uname -n | cut -d '.' -f 1`
|
|
Simone Caronni |
e0615f |
-if test x${hostname} = x ; then
|
|
Simone Caronni |
e0615f |
- hostname="localhost"
|
|
Simone Caronni |
e0615f |
-fi
|
|
Simone Caronni |
e0615f |
-ping -c 1 $hostname 2>/dev/null 1>/dev/null
|
|
Simone Caronni |
e0615f |
-if test ! $? = 0; then
|
|
Simone Caronni |
e0615f |
- hostname="localhost"
|
|
Simone Caronni |
e0615f |
-fi
|
|
Simone Caronni |
e0615f |
-
|
|
Simone Caronni |
e0615f |
case "$DISTNAME" in
|
|
Simone Caronni |
e0615f |
aix)
|
|
Simone Caronni |
e0615f |
DISTVER=`uname -r`
|