From: Nigel McNie <nigel@catalyst.net.nz>
Date: Tue, 3 Apr 2007 02:54:55 +0000 (+1200)
Subject: Get the hostname in a more safe fashion.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ba13120610ba5a2772dd51113caf791d8fe642f5;p=vserverctl.git

Get the hostname in a more safe fashion.

Apparently, $ENV{HOSTNAME} is a bashism, and given the Sys::Hostname modules appears to be available, we can just use that.
---

diff --git a/vserverctl b/vserverctl
index 035e41c..8c5ddb4 100755
--- a/vserverctl
+++ b/vserverctl
@@ -7,6 +7,8 @@ use Config::Auto;
 use File::Slurp qw(slurp write_file);
 use Carp;
 use File::Basename;
+use Sys::Hostname;
+my $hostname = hostname;
 
 my $baseDir = '/vserver/';
 my $profileBaseDir = $baseDir . '.profile/';
@@ -109,7 +111,7 @@ if ( $action eq 'add' ) {
         my $data = slurp($key);
         $data =~ s/__VSNAME__/$vsname/g;
         $data =~ s/__VSIPADDR__/$ipaddr/g;
-        $data =~ s/__HOST__/$ENV{HOSTNAME}/g;
+        $data =~ s/__HOST__/$hostname/g;
         write_file($vsroot . '.template', $data);
         system('mv', $vsroot . '.template', $vsroot . $templates{$key} . $file);
     }