--- lib/PXElator/config.pm	2010/01/02 17:45:58	460
+++ lib/PXElator/config.pm	2010/05/03 15:38:16	501
@@ -14,7 +14,10 @@
 
 our $mounted;
 
-sub available { qw/katalog debian_live webconverger debirf tinycore nfsroot openvz printer wrt/ };
+our $server;
+our $server_ip;
+
+sub available { qw/katalog debian_live webconverger debirf tinycore nfsroot openvz printer wrt clonezilla/ };
 
 sub debian_live {
 	my ($ip) = @_;
@@ -33,7 +36,7 @@
 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
+	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
 	});
 
 }
@@ -56,16 +59,16 @@
 	my $hostname = client::conf( $ip => 'hostname' ) || 'webconverger';
 
 	my $homepage = client::conf( $ip => 'webconverger/homepage'
-		, default => "http://${server::ip}:7777/client" );
+		, default => "http://$server_ip:7777/client" );
 	my $fetch    = client::conf( $ip => 'webconverger/fetch'
-		, default => "http://${server::ip}:7777/webconverger/iso/live/filesystem.squashfs" );
+		, default => "http://$server_ip:7777/webconverger/iso/live/filesystem.squashfs" );
 
 	pxelinux::config_for_ip( $ip, 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=$fetch boot=live quiet nosudo splash video=vesa:ywrap,mtrr vga=788 nopersistent username=webc hostname=$hostname union=aufs homepage=$homepage locale=hr noprompt
+	append initrd=iso/live/initrd.img-2.6.30-backports.1-486 fetch=$fetch boot=live quiet nosudo splash video=vesa:ywrap,mtrr vga=788 nopersistent username=webc hostname=$hostname union=aufs homepage=$homepage locale=hr noprompt kioskresetstation=10
 
 	});
 
@@ -76,7 +79,7 @@
 	$mounted->{"webconverger/$ip"} ||= upstream::iso( 'http://download.webconverger.com/webc-5.5.iso' );
 	my $hostname = client::conf( $ip => 'hostname' ) || 'katalog';
 	my $homepage = client::conf( $ip => 'webconverger/homepage' => "http://koha.ffzg.hr" );
-	my $fetch    = client::conf( $ip => 'webconverger/fetch' => "http://${server::ip}:7777/webconverger/custom.squashfs" );
+	my $fetch    = client::conf( $ip => 'webconverger/fetch' => "http://$server_ip:7777/webconverger/custom.squashfs" );
 
 	pxelinux::config_for_ip( $ip, qq{
 
@@ -124,6 +127,18 @@
 	});
 }
 
+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 in_chroot {
 	my ( $dir, $command ) = @_;
 	write_file "$dir/tmp/inside.sh", $command;
@@ -133,6 +148,9 @@
 sub nfsroot {
 	my $ip = shift || die "no ip?";
 
+	my $dist = 'lenny';
+	$dist = 'squeeze';
+
 	my $nfsroot = "$server::base_dir/tftp/nfsroot";
 	my $debian_mirror = server::conf_default( 'debian_mirror', 'http://ftp.debian.org/debian' );
 
@@ -145,17 +163,19 @@
 
 	if ( ! -e $debootstrap ) {
 
-		system "sudo debootstrap --arch i386 lenny $debootstrap $debian_mirror";
+		system "sudo debootstrap --arch i386 $dist $debootstrap $debian_mirror";
 
-		file::append "$debootstrap/etc/apt/sources.list.d/non-free.list", "deb $debian_mirror lenny non-free\n";
+		file::append "$debootstrap/etc/apt/sources.list.d/non-free.list", "deb $debian_mirror $dist non-free\n";
 		in_chroot     $debootstrap => 'apt-get update';
 
 		file::append "$debootstrap/etc/kernel-img.conf", "do_initrd = Yes\n";
-		in_chroot     $debootstrap => 'apt-get install -y --force-yes atl2-modules-2.6-686 firmware-bnx2';
-		in_chroot     $debootstrap => 'apt-get -f install -y --force-yes locales';	# linux-image-2.6-686
+		in_chroot     $debootstrap => 'apt-get -f install -y --force-yes locales linux-image-2.6-686 firmware-bnx2';
 
+		# this can fails on some distros, so we run it alone
+		in_chroot     $debootstrap => 'apt-get install -y --force-yes atl2-modules-2.6-686';
 		file::append "$debootstrap/etc/initramfs-tools/modules", "atl2\n";
-		file::change("$debootstrap/etc/initramfs-tools/initramfs.conf",  'BOOT=local' => 'BOOT=nfs' ) &&
+
+		file::change "$debootstrap/etc/initramfs-tools/initramfs.conf",  'BOOT=local' => 'BOOT=nfs';
 		in_chroot     $debootstrap => 'update-initramfs -u';
 
 	}
@@ -177,7 +197,11 @@
 	
 	}
 
-	my $server = server::as_hash_for $ip;
+	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";
+	}
 
 	my $hostname = client::conf( $ip => 'hostname' ) || 'nfsroot';
 	file::replace "$export/etc/hostname", $hostname;
@@ -200,14 +224,8 @@
 		file::append "$export/etc/rc.local", $_;
 	} ( '/srv/sysadmin-cookbook/recepies/amt/serial-console.sh' );
 
-	pxelinux::config_for_ip( $ip, qq{
-
-default nfsroot
-label nfsroot
-	kernel debootstrap/vmlinuz
-	append initrd=debootstrap/initrd.img root=/dev/nfs nfsroot=$server->{ip}:$export ro ip=dhcp
+	pxelinux::config_ip_boot( $ip, "$export/boot", "root=/dev/nfs nfsroot=$server->{ip}:$export ro ip=dhcp" );
 
-	});
 }
 
 sub openvz {
@@ -219,9 +237,10 @@
 
 sub for_ip {
 	my $ip = shift || return;
+	$server = server::as_hash_for $ip;
+	$server_ip = $server->{ip} || die "no server ip";
 	my $config = client::conf( $ip => 'config' ) || return;
-	eval $config . '($ip)';
-#	$tftp::dir = "$server::base_dir/tftp/$pxelinux::path_prefix";
+	eval $config . '($ip)'; # must be last
 }
 
 warn 'loaded';