--- lib/PXElator/config.pm	2009/08/19 23:12:18	273
+++ lib/PXElator/config.pm	2009/10/02 10:23:56	450
@@ -8,12 +8,13 @@
 use pxelinux;
 use client;
 use file;
+use ssh;
 
 use File::Slurp;
 
 our $mounted;
 
-sub available { qw/debian_live webconverger debirf tinycore nfsroot/ };
+sub available { qw/katalog debian_live webconverger debirf tinycore nfsroot openvz printer wrt/ };
 
 sub debian_live {
 	my ($ip) = @_;
@@ -32,7 +33,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
+	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
 	});
 
 }
@@ -50,22 +51,43 @@
 sub webconverger {
 	my ($ip) = @_;
 
-	$mounted->{$ip} ||= upstream::iso( 'http://download.webconverger.com/webc-5.2.iso' );
+	$mounted->{"webconverger/$ip"} ||= upstream::iso( 'http://download.webconverger.com/webc-5.5.iso' );
 
-	my $homepage = client::conf( $ip => 'homepage', default => "http://${server::ip}:7777/client" );
 	my $hostname = client::conf( $ip => 'hostname' ) || 'webconverger';
 
+	my $homepage = client::conf( $ip => 'webconverger/homepage'
+		, default => "http://${server::ip}:7777/client" );
+	my $fetch    = client::conf( $ip => 'webconverger/fetch'
+		, 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=http://${server::ip}:7777/webconverger/iso/live/filesystem.squashfs boot=live quiet nosudo splash video=vesa:ywrap,mtrr vga=788 nopersistent username=webc hostname=$hostname union=aufs homepage=$homepage locale=hr
+	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
 
 	});
 
 }
 
+sub katalog {
+	my ($ip) = @_;
+	$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" );
+
+	pxelinux::config_for_ip( $ip, qq{
+
+default katalog
+label katalog
+	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
+
+	});
+
+}
 =head1 debirf
 
 debirf is a system that will create diskless, all-in-ram images (kernel and initramfs) that boot entirely into ram and leave the user in a fully functional Debian system. 
@@ -109,7 +131,7 @@
 }
 
 sub nfsroot {
-	my $ip = shift;
+	my $ip = shift || die "no ip?";
 
 	my $nfsroot = "$server::base_dir/tftp/nfsroot";
 	my $debian_mirror = server::conf_default( 'debian_mirror', 'http://ftp.debian.org/debian' );
@@ -133,24 +155,14 @@
 		file::change("$debootstrap/etc/initramfs-tools/initramfs.conf",  'BOOT=local' => 'BOOT=nfs' ) &&
 		in_chroot     $debootstrap => 'update-initramfs -u';
 
-		file::append "$debootstrap/etc/rsyslog.d/pxelator.conf", "*.*\t\@$server::ip\n";
-		file::append "$debootstrap/etc/network/interfaces", qq{
-
-auto lo
-iface lo inet loopback
-
-allow-hotplug eth0
-iface eth0 inet dhcp
-
-		};
-
 	}
 
 	my $export = "$nfsroot/$ip";
 	my $br     = "$nfsroot/br/$ip";
 
-	my $m = $mounted->{$ip} ||= `mount | grep $export`;
-	if ( ! $m ) {
+	$mounted->{"nfsroot/$ip"} ||= `mount | grep $export`;
+
+	if ( ! $mounted->{"nfsroot/$ip"} ) {
 		warn "mounting $export";
 
 		mkdir "$nfsroot/br"	unless -e "$nfsroot/br";
@@ -160,11 +172,28 @@
 		system "sudo mount -t aufs -o br:$br:$debootstrap none $export";
 		system "sudo exportfs -i -o rw,async,no_root_squash,no_subtree_check,fsid=999 $ip:$export";
 	
-		my $hostname = client::conf( $ip => 'hostname' ) || 'nfsroot';
-		write_file "$export/etc/hostname", $hostname;
-		file::append "$export/hosts", '127.0.0.1';
 	}
 
+	my $hostname = client::conf( $ip => 'hostname' ) || 'nfsroot';
+	file::replace "$export/etc/hostname", $hostname;
+	file::replace "$export/etc/hosts", "127.0.0.1\tlocalhost $hostname\n";
+	file::replace "$export/etc/resolv.conf", "domain $server::domain_name\nnameserver $server::ip\n";
+	file::replace "$export/etc/rsyslog.d/pxelator.conf", "*.*\t\@$server::ip\n";
+
+	file::append "$debootstrap/etc/network/interfaces", qq{
+
+auto lo
+iface lo inet loopback
+
+allow-hotplug eth0
+iface eth0 inet dhcp
+
+	};
+
+	map {
+		file::copy_once $_ => "$export/$_";
+		file::append "$export/etc/rc.local", $_;
+	} ( '/srv/sysadmin-cookbook/recepies/amt/serial-console.sh' );
 
 	pxelinux::config_for_ip( $ip, qq{
 
@@ -176,10 +205,17 @@
 	});
 }
 
-sub for_ip {
+sub openvz {
 	my $ip = shift;
-	my $deploy = client::conf( $ip => 'deploy', default => 'webconverger' );
-	eval $deploy . '($ip)';
+	ssh::shell( $ip, 'cat /proc/vz/veinfo', 'vzlist -a', 'uptime', 'free', 'df', 'zfs list' );
+}
+sub printer     {}
+sub wrt         {}
+
+sub for_ip {
+	my $ip = shift || return;
+	my $config = client::conf( $ip => 'config' ) || return;
+	eval $config . '($ip)';
 #	$tftp::dir = "$server::base_dir/tftp/$pxelinux::path_prefix";
 }