--- lib/PXElator/config.pm 2009/08/05 23:53:24 154 +++ lib/PXElator/config.pm 2009/08/06 15:15:53 156 @@ -6,6 +6,7 @@ use server; use pxelinux; +use client; use File::Slurp; sub available { qw/debian_live webconverger debirf tinycore/ }; @@ -31,8 +32,8 @@ upstream::iso( 'http://download.webconverger.com/webc-5.2.iso' ); - my $homepage = server::shared( "$ip/homepage" ) || "http://${server::ip}:7777/client"; - my $hostname = server::shared( "$ip/hostname" ) || 'webconverger'; + my $homepage = client::conf( $ip => 'homepage', default => "http://${server::ip}:7777/client" ); + my $hostname = client::conf( $ip => 'hostname', default => 'webconverger' ); pxelinux::config_for_ip( $ip, qq{ @@ -83,7 +84,7 @@ sub for_ip { my $ip = shift; - my $deploy = server::shared( "deploy/$ip" ) || 'webconverger'; + my $deploy = client::conf( $ip => 'deploy', default => 'webconverger' ); eval $deploy . '($ip)'; # $tftp::dir = "$server::base_dir/tftp/$pxelinux::path_prefix"; }