summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2004-11-14 22:54:11 +0000
committerPeter Palfrader <peter@palfrader.org>2004-11-14 22:54:11 +0000
commit37f9798469b1240c131a83086986b7494b627e2a (patch)
tree28452dc0b0959d5f1e2572277ca5e3f6aa71b49a
parent35e54656cb0d8629bae2668d445f644d56cd184a (diff)
Handle empty PATH too
-rw-r--r--Echolot/Config.pm8
-rw-r--r--NEWS4
-rwxr-xr-xdebian/echolot.init3
-rwxr-xr-xdebian/echolot.postinst1
4 files changed, 11 insertions, 5 deletions
diff --git a/Echolot/Config.pm b/Echolot/Config.pm
index 5ef4fda..547d812 100644
--- a/Echolot/Config.pm
+++ b/Echolot/Config.pm
@@ -316,9 +316,11 @@ sub check_binaries() {
unless -x $path;
} else {
my $found = 0;
- for my $pathelem (split /:/, $ENV{'PATH'}) {
- $found = $pathelem, last
- if -e $pathelem.'/'.$path;
+ if (defined $ENV{'PATH'}) {
+ for my $pathelem (split /:/, $ENV{'PATH'}) {
+ $found = $pathelem, last
+ if -e $pathelem.'/'.$path;
+ };
};
if ($found) {
Echolot::Log::warn ("$bin binary $found/$path is not executeable")
diff --git a/NEWS b/NEWS
index 9708477..85447fc 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,8 @@ Changes in version -
script
* debian: Create echolot user group in proper gid space.
* debian: remove debconf stuff.
- * handle empty environment better - we would whine when
- HOME is not set previously.
+ * handle empty environment better - previously we would whine
+ when HOME or PATH were not set.
Changes in version 2.1.6 - 2004-08-07
* Catch a possible use of undefined values in a log trace() call.
diff --git a/debian/echolot.init b/debian/echolot.init
index 50fcabc..fc14c63 100755
--- a/debian/echolot.init
+++ b/debian/echolot.init
@@ -20,6 +20,9 @@ DESC="Echolot Ping Daemon"
NAME="pingd"
test -f $DAEMON || exit 0
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+export PATH
+
# Reads config file (will override defaults above)
[ -r /etc/default/echolot ] && . /etc/default/echolot
diff --git a/debian/echolot.postinst b/debian/echolot.postinst
index 28edcb2..b638d88 100755
--- a/debian/echolot.postinst
+++ b/debian/echolot.postinst
@@ -34,6 +34,7 @@ if [ "$1" = "configure" ] && [ -e /usr/share/debconf/confmodule ]; then
if dpkg --compare-versions "$2" lt "2.1.7" ; then
. /usr/share/debconf/confmodule
db_purge
+ db_stop
fi
fi