Prva verzija za buster.

[ocsinventory-agent-cn.git] / Hostname.pm

diff --git a/Hostname.pm b/Hostname.pm
index e641d8d..c576c58 100644 (file)
--- a/Hostname.pm
+++ b/Hostname.pm
@@ -1,34 +1,22 @@
 package Ocsinventory::Agent::Backend::OS::Generic::Hostname;
 
 sub check {
-  eval { require (Sys::Hostname) };
-  return 1 unless $@;
-  `which hostname 2>&1`;
-  return if ($? >> 8)!=0;
-  `hostname 2>&1`;
-  return if ($? >> 8)!=0;
-  1;
+    my $params = shift;
+    my $common = $params->{common};
+    return 1 if $common->can_run ("hostname");
+    0;
 }
 
 # Initialise the distro entry
 sub run {
-  my $params = shift;
-  my $inventory = $params->{inventory};
+    my $params = shift;
+    my $common = $params->{common};
 
-  my $hostname;
+    my $hostname;
 
-  # ico, Tue, 26 May 2009 17:58:27 +0200
-  chomp ( my $hostname = `hostname --fqdn` );
-  #eval { require (Sys::Hostname) };
-  #if (!$@) {
-  #  $hostname = Sys::Hostname::hostname();
-  #} else {
-  #  chomp ( $hostname = `hostname` ); # TODO: This is not generic.
-  #}
-  #$hostname =~ s/\..*//; # keep just the hostname
+    chomp ( $hostname = `hostname -f` ); # TODO: This is not generic.
 
-
-  $inventory->setHardware ({NAME => $hostname});
+    $common->setHardware ({NAME => $hostname});
 }
 
 1;