From: Ian Jackson <Ian.Jackson@eu.citrix.com>
Date: Tue, 3 Mar 2015 19:33:58 +0000 (+0000)
Subject: serialmgr: Look for things in /usr, not /usr/local
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=sympathy.git;a=commitdiff_plain;h=100b082e5627ddf068dd6774e674ede900912207

serialmgr: Look for things in /usr, not /usr/local

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---

diff --git a/serialmgr/serialmgrd b/serialmgr/serialmgrd
index 9fec92c..e3c260a 100755
--- a/serialmgr/serialmgrd
+++ b/serialmgr/serialmgrd
@@ -12,8 +12,8 @@ my $stuff = [];
 my $hosts = [];
 my $hup   = 0;
 
-my $consolidate_exe = "/usr/local/bin/consolidate";
-my $sympathy_exe    = "/usr/local/bin/sympathy";
+my $consolidate_exe = "/usr/bin/consolidate";
+my $sympathy_exe    = "/usr/bin/sympathy";
 
 my @keys = qw(host portcode baud task user password name options);
 
@@ -76,10 +76,10 @@ sub check_users($) {
     for my $l (@$c) {
         my $shell;
         if ( $l->{task} eq "sympathy" ) {
-            $shell = "/usr/local/bin/run_sympathy";
+            $shell = "/usr/bin/run_sympathy";
         }
         else {
-            $shell = "/usr/local/bin/run_conclient";
+            $shell = "/usr/bin/run_conclient";
         }
         if ( not defined getpwnam( $l->{user} ) ) {
             syslog( LOG_ERR, "creating an account for user " . $l->{user} );