--- lib/PXElator/pxe.pm	2009/07/29 22:04:58	45
+++ lib/PXElator/pxe.pm	2009/07/30 15:23:29	60
@@ -2,10 +2,11 @@
 
 use warnings;
 use strict;
+use autodie;
 
 use File::Slurp;
 
-use server;
+use httpd;
 use tftpd;
 
 our $file = 'gpxelinux.0';
@@ -13,18 +14,22 @@
 symlink '/usr/lib/syslinux/gpxelinux.0', $path unless -l $path;
 warn "file $path ", -s $path;
 
-my $url = "http://$server::ip/pxelator/debian-live/";
-my $squash = tftpd::path('debian-live/*squashfs');
+my $url = $httpd::url;
+$url = "tftp://$server::ip/"; # fallback to tftp
+$url = "http://$server::ip/pxelator/";
 
+my $squash = tftpd::path('debian-live/*squashfs');
 
-my $config = "$ftpd::dir/pxelinux.cfg/default";
+my $config = "$tftpd::dir/pxelinux.cfg";
+mkdir $config unless -d $config;
+$config .= '/default';
 
 write_file $config, qq{
 
 default linux
 label linux
-	kernel $url/vmlinuz1
-	append initrd=$url/initrd1.img boot=live union=aufs noswap noprompt vga=normal fetch=$url/$squash
+	kernel $url/debian-live/vmlinuz1
+	append initrd=$url/debian-live/initrd1.img boot=live union=aufs noswap noprompt vga=normal fetch=$url/$squash
 
 };