--- lib/PXElator/config.pm	2010/02/16 17:50:11	499
+++ lib/PXElator/config.pm	2010/09/17 19:37:03	533
@@ -17,7 +17,7 @@
 our $server;
 our $server_ip;
 
-sub available { qw/katalog debian_live webconverger debirf tinycore nfsroot openvz printer wrt/ };
+sub available { qw/katalog debian_live webconverger debirf tinycore nfsroot openvz printer wrt clonezilla ubuntu memdisk vyatta android/ };
 
 sub debian_live {
 	my ($ip) = @_;
@@ -116,7 +116,7 @@
 
 sub tinycore {
 	my $ip = shift;
-	upstream::iso( 'http://distro.ibiblio.org/pub/linux/distributions/tinycorelinux/2.x/release/tinycore_2.2.iso' );
+	upstream::iso( 'http://distro.ibiblio.org/pub/linux/distributions/tinycorelinux/3.x/release/tinycore-current.iso' );
 	pxelinux::config_for_ip( $ip, qq{
 
 default linux
@@ -127,6 +127,110 @@
 	});
 }
 
+sub clonezilla {
+	my $ip = shift;
+	upstream::iso( 'http://sourceforge.net/projects/clonezilla/files/clonezilla_live_alternative_testing/clonezilla-live-20100503-lucid.iso/download' );
+	pxelinux::config_for_ip( $ip, qq{
+
+default linux
+label linux
+	kernel iso/live/vmlinuz
+	append initrd=iso/live/initrd.img boot=live union=aufs noswap noprompt vga=788 fetch=http://$server_ip:7777/clonezilla/iso/live/filesystem.squashfs
+
+	});
+}
+
+sub ubuntu {
+	my $ip = shift;
+	upstream::iso( 'http://mirrors.us.kernel.org/ubuntu-releases/lucid/ubuntu-10.04-desktop-i386.iso' );
+
+	my $export = "$server::base_dir/tftp/ubuntu/iso";
+	my $exported = `exportfs | grep $export`;
+	if ( $exported ne $export ) {
+		warn "exportfs $exported\n";
+		system "sudo exportfs -i -o rw,async,no_root_squash,no_subtree_check,fsid=999 $ip:$export";
+	}
+	pxelinux::config_for_ip( $ip, qq{
+
+default linux
+label linux
+	kernel iso/casper/vmlinuz
+	append initrd=iso/casper/initrd.lz boot=casper netboot=nfs nfsroot=$server_ip:$export --
+
+	});
+}
+
+sub memdisk {
+	my $ip = shift;
+
+	my $dir = "$server::base_dir/tftp/memdisk";
+	mkdir $dir unless -e $dir;
+
+	symlink '/usr/lib/syslinux/memdisk', "$dir/memdisk" unless -e "$dir/memdisk";
+
+	my $image = client::conf( $ip => 'memdisk.image' );
+
+	if ( ! $image ) {
+		$image = 'freedos.gz';
+		upstream::mirror_file 'http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/unofficial/balder/balder10.imz' => "$dir/$image";
+		warn "using $image [default FreeDOS]\n";
+		symlink "$dir/$image", client::ip_path $ip . '/memdisk.image';
+	} else {
+		$image =~ s{^.+/tftp/memdisk/}{} && warn "using $image\n";
+	}
+
+	if ( my $kvm = client::conf $ip => 'kvm' ) {
+		client::conf $ip => 'kvm.bin', 'qemu-system-i386'; # FIXME kvm doesn't seem to work
+	}
+
+	pxelinux::config_for_ip( $ip, qq{
+
+default $image
+label $image
+	kernel memdisk
+	append initrd=$image
+
+	});
+}
+
+sub vyatta {
+	my $ip = shift;
+	upstream::iso( 'http://www.vyatta.com/downloads/vc6.1/vyatta-livecd_VC6.1-2010.08.20_i386.iso' );
+
+	my $dir = "$server::base_dir/tftp/vyatta";
+	symlink '/usr/lib/syslinux/memdisk', "$dir/memdisk" unless -e "$dir/memdisk";
+
+	pxelinux::config_for_ip( $ip, qq{
+
+default vyatta
+label vyatta
+
+	kernel iso/live/vmlinuz1
+	append initrd=iso/live/initrd1.img boot=live nopersistent noautologin nonetworking nouser hostname=vyatta fetch=http://$server_ip:7777/vyatta/iso/live/filesystem.squashfs
+
+	});
+}
+
+sub android {
+	my $ip = shift;
+	my $path = upstream::iso( 'http://android-x86.googlecode.com/files/android-x86-1.6-r2.iso' );
+
+	my $dir = "$server::base_dir/tftp/android";
+	symlink '/usr/lib/syslinux/memdisk', "$dir/memdisk" unless -e "$dir/memdisk";
+
+	client::conf $ip => 'kvm.boot' => "n -cdrom $path";
+
+	pxelinux::config_for_ip( $ip, qq{
+
+default android-1.6-donut
+label android-1.6-donut
+
+	kernel iso/kernel
+	append initrd=iso/initrd.img root=/dev/ram0 androidboot_hardware=eeepc acpi_sleep=s3_bios,s3_mode quiet SRC= DATA= SDCARD= vga=788 DEBUG=1
+
+	});
+}
+
 sub in_chroot {
 	my ( $dir, $command ) = @_;
 	write_file "$dir/tmp/inside.sh", $command;
@@ -228,7 +332,12 @@
 	$server = server::as_hash_for $ip;
 	$server_ip = $server->{ip} || die "no server ip";
 	my $config = client::conf( $ip => 'config' ) || return;
-	eval $config . '($ip)'; # must be last
+	my $ret = eval $config . '($ip)'; # must be last
+	if ( $@ ) {
+		warn "ERROR in executing $config($ip): $@\n";
+		$ret .= qq{<pre style="color:red">$@</pre>};
+	}
+	return $ret;
 }
 
 warn 'loaded';