From f176d7c1bacef39633bcb11c8270328c1e7cc512 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Fri, 8 Aug 2014 06:32:02 +0000
Subject: [PATCH] portability fix on linux

---
 Netdisco/bin/netdisco-daemon-fg                     | 3 +++
 Netdisco/lib/App/Netdisco/DB/Result/Admin.pm        | 4 ++--
 Netdisco/lib/App/Netdisco/Daemon/DB/Result/Admin.pm | 4 ++--
 Netdisco/lib/App/Netdisco/Util/Daemon.pm            | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Netdisco/bin/netdisco-daemon-fg b/Netdisco/bin/netdisco-daemon-fg
index a1955116..d3585cf5 100755
--- a/Netdisco/bin/netdisco-daemon-fg
+++ b/Netdisco/bin/netdisco-daemon-fg
@@ -7,6 +7,9 @@ use FindBin;
 FindBin::again();
 use Path::Class 'dir';
 
+# get a segfault if we load this later
+use if $^O eq 'linux', 'Sys::Proctitle';
+
 BEGIN {
   # stuff useful locations into @INC
   unshift @INC,
diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Admin.pm b/Netdisco/lib/App/Netdisco/DB/Result/Admin.pm
index 0de254ac..439046fe 100644
--- a/Netdisco/lib/App/Netdisco/DB/Result/Admin.pm
+++ b/Netdisco/lib/App/Netdisco/DB/Result/Admin.pm
@@ -69,8 +69,8 @@ sub summary {
     return join ' ',
       $job->action,
       ($job->device || ''),
-      ($job->port || ''),
-      ($job->subaction ? (q{'}. $job->subaction .q{'}) : '');
+      ($job->port || '');
+#      ($job->subaction ? (q{'}. $job->subaction .q{'}) : '');
 }
 
 =head1 ADDITIONAL COLUMNS
diff --git a/Netdisco/lib/App/Netdisco/Daemon/DB/Result/Admin.pm b/Netdisco/lib/App/Netdisco/Daemon/DB/Result/Admin.pm
index 34cc690c..e73d981d 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/DB/Result/Admin.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/DB/Result/Admin.pm
@@ -57,8 +57,8 @@ sub summary {
     return join ' ',
       $job->action,
       ($job->device || ''),
-      ($job->port || ''),
-      ($job->subaction ? (q{'}. $job->subaction .q{'}) : '');
+      ($job->port || '');
+#      ($job->subaction ? (q{'}. $job->subaction .q{'}) : '');
 }
 
 =head1 ADDITIONAL COLUMNS
diff --git a/Netdisco/lib/App/Netdisco/Util/Daemon.pm b/Netdisco/lib/App/Netdisco/Util/Daemon.pm
index 4b0bf175..d002a1c8 100644
--- a/Netdisco/lib/App/Netdisco/Util/Daemon.pm
+++ b/Netdisco/lib/App/Netdisco/Util/Daemon.pm
@@ -3,8 +3,8 @@ package App::Netdisco::Util::Daemon;
 use strict;
 use warnings;
 
-use Module::Load ();
-eval { Module::Load::load 'Sys::Proctitle' };
+# make sure this is already done elsewhere
+use if $^O eq 'linux', 'Sys::Proctitle';
 
 use base 'Exporter';
 our @EXPORT = 'prctl';