From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sat, 2 Jan 2010 17:45:58 +0000 (+0000)
Subject: nfsroot uses server::as_hash_for
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;ds=sidebyside;h=9963e1f7d0016cf6d6cfc90b8fce183541a7c042;p=pxelator

nfsroot uses server::as_hash_for
---

diff --git a/lib/PXElator/config.pm b/lib/PXElator/config.pm
index 9d1c2a6..668160b 100644
--- a/lib/PXElator/config.pm
+++ b/lib/PXElator/config.pm
@@ -177,11 +177,13 @@ sub nfsroot {
 	
 	}
 
+	my $server = server::as_hash_for $ip;
+
 	my $hostname = client::conf( $ip => 'hostname' ) || 'nfsroot';
 	file::replace "$export/etc/hostname", $hostname;
 	file::replace "$export/etc/hosts", "127.0.0.1\tlocalhost $hostname\n";
-	file::replace "$export/etc/resolv.conf", "domain $server::domain_name\nnameserver $server::ip\n";
-	file::replace "$export/etc/rsyslog.d/pxelator.conf", "*.*\t\@$server::ip\n";
+	file::replace "$export/etc/resolv.conf", "domain $server->{domain}\nnameserver $server->{ip}\n";
+	file::replace "$export/etc/rsyslog.d/pxelator.conf", "*.*\t\@$server->{ip}\n";
 
 	file::append "$debootstrap/etc/network/interfaces", qq{
 
@@ -203,7 +205,7 @@ iface eth0 inet dhcp
 default nfsroot
 label nfsroot
 	kernel debootstrap/vmlinuz
-	append initrd=debootstrap/initrd.img root=/dev/nfs nfsroot=$server::ip:$export ro ip=dhcp
+	append initrd=debootstrap/initrd.img root=/dev/nfs nfsroot=$server->{ip}:$export ro ip=dhcp
 
 	});
 }