--- lib/PXElator/config.pm	2010/07/21 17:56:42	513
+++ lib/PXElator/config.pm	2010/09/17 22:00:49	538
@@ -9,6 +9,7 @@
 use client;
 use file;
 use ssh;
+use upstream;
 
 use File::Slurp;
 
@@ -17,32 +18,50 @@
 our $server;
 our $server_ip;
 
-sub available { qw/katalog debian_live webconverger debirf tinycore nfsroot openvz printer wrt clonezilla ubuntu memdisk/ };
+sub available { qw/katalog debian_live webconverger debirf tinycore nfsroot openvz printer wrt clonezilla ubuntu memdisk vyatta android/ };
 
 sub debian_live {
 	my ($ip) = @_;
 
-	upstream::files( qw{
-		http://cdimage.debian.org/cdimage/release/current-live/i386/web/
-		vmlinuz1
-		initrd1.img
-		debian-live-501-i386-standard.squashfs
-	});
+	my $from = 'http://cdimage.debian.org/cdimage/release/current-live/i386/web/';
+	$from = 'http://cdimage.debian.org/cdimage/squeeze_live_alpha2/i386/web/';
+	my $variant = 'standard';
+
+	my $dir = upstream::files $from => 'MD5SUMS';
+
+	my ( $vmlinuz, $initrd, $squashfs );
+	
+	my @md5sum = read_file "$dir/MD5SUMS";
+
+	foreach ( @md5sum ) {
+		$vmlinuz = $1 if m/\s+(\S*vmlinuz\S*)/;
+		$initrd = $1 if m/\s+(\S*$variant\S*initrd\S*)/;
+		$squashfs = $1 if m/\s+(\S*$variant\S*\.squashfs)$/;
+		warn "# MD5SUM: $_\n";
+	}
+
+	upstream::files $from => $vmlinuz, $initrd, $squashfs;
 
 	my $hostname = client::conf( $ip => 'hostname' ) || 'debian-live';
 
+	# FIXME drop in shell because users doesn't work in current image
+	my $custom_init = 'init=/bin/hash';
+
+	if ( my $custom_squashfs = client::conf( $ip => 'squashfs' ) ) {
+		$squashfs = $custom_squashfs;
+		$custom_init = '';
+	}
+
 	pxelinux::config_for_ip( $ip, qq{
 
 default debian_live
 label debian_live
-	kernel vmlinuz1
-	append initrd=initrd1.img fetch=http://$server_ip:7777/debian_live/debian-live-501-i386-standard.squashfs boot=live nopersistent hostname=$hostname union=aufs noprompt
+	kernel $vmlinuz
+	append initrd=$initrd fetch=http://$server_ip:7777/debian_live/$squashfs boot=live nopersistent hostname=$hostname union=aufs noprompt autologin username=user debug $custom_init
 	});
 
 }
 
-use upstream;
-
 =head1 webconverger
 
 Webconverger - the opensource Web Kiosk
@@ -116,7 +135,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
@@ -174,10 +193,15 @@
 		$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
@@ -188,6 +212,44 @@
 	});
 }
 
+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;
@@ -289,7 +351,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';