--- lib/PXElator/config.pm	2009/08/04 13:31:06	137
+++ lib/PXElator/config.pm	2009/08/04 15:25:09	138
@@ -8,69 +8,34 @@
 use pxelinux;
 use File::Slurp;
 
-sub shared {
-	my ($name, $value) = @_;
-
-	my $path ="$server::base_dir/conf/$server::ip/$name";
-	if ( defined $value ) {
-		write_file $path, $value;
-	} else {
-		$value = read_file $path if -e $path;
-	}
-	return $value;
-}
-
 sub debian_live {
 	$dhcpd::file = "pxelinux.0";
 	$pxelinux::path_prefix = 'live-helper/tftpboot/';
 	$pxelinux::config_file = 'pxelinux.cfg/default';
 }
 
-use LWP::Simple qw/mirror RC_NOT_MODIFIED/;
-sub webconverger {
-	$dhcpd::file = "pxelinux.0";
-	$pxelinux::path_prefix = 'webconverger/';
-
-	my $dir = "$server::base_dir/tftp/$pxelinux::path_prefix";
-
-	mkdir $dir unless -d $dir;
-
-	my $cfg = "$dir/pxelinux.cfg";
-	return 1 if -e $cfg;
+use upstream;
 
-	mkdir $cfg;
-
-	my $iso = '/srv/pxelator/iso/webc-5.2.iso';
-	my $url = 'http://download.webconverger.com/webc-5.2.iso';
-
-	print STDERR "mirror $url";
-	mirror( $url, $iso)
-		== RC_NOT_MODIFIED
-		&& warn(" not modified\n")
-		|| warn(" done ", -s $iso, " bytes\n")
-		;
-
-	mkdir "$dir/iso" unless -e "$dir/iso";
-
-	system "mount -t iso9660 | grep webc-5.2 || sudo mount $iso $dir/iso/ -o loop -t iso9660 -v";
+sub webconverger {
+	my $ip = shift;
 
-	symlink "/usr/lib/syslinux/pxelinux.0", "$dir/$dhcpd::file";
+	upstream::iso( 'http://download.webconverger.com/webc-5.2.iso' );
 
-	$cfg .= '/default';
+	pxelinux::config_for_ip( $ip, qq{
 
-	write_file $cfg, qq{
+default webconverger
 label webconverger
 	kernel iso/live/vmlinuz-2.6.30-backports.1-486
 	append initrd=iso/live/initrd.img-2.6.30-backports.1-486 fetch=http://172.16.10.1/pxelator/webconverger/iso/live/filesystem.squashfs boot=live quiet homepage=http://172.16.10.1:7777/ nonetworking nosudo splash video=vesa:ywrap,mtrr vga=788 nopersistent username=webc hostname=webconverger union=aufs
-	};
 
-#	$pxelinux::config_file = $cfg;
+	});
+
 }
 
 sub for_ip {
 	my $ip = shift;
 #	debian_live();
-	webconverger();
+	webconverger($ip);
 #	$tftp::dir = "$server::base_dir/tftp/$pxelinux::path_prefix";
 }