--- lib/PXElator/config.pm	2009/08/19 18:10:37	270
+++ lib/PXElator/config.pm	2009/08/19 22:48:54	271
@@ -7,6 +7,8 @@
 use server;
 use pxelinux;
 use client;
+use file;
+
 use File::Slurp;
 
 sub available { qw/debian_live webconverger debirf tinycore nfsroot/ };
@@ -98,6 +100,14 @@
 	});
 }
 
+sub in_chroot {
+	my ( $dir, $command ) = @_;
+	write_file "$dir/tmp/inside.sh", $command;
+	system "sudo chroot $dir sh -x /tmp/inside.sh";
+}
+
+our $mounted;
+
 sub nfsroot {
 	my $ip = shift;
 
@@ -105,43 +115,63 @@
 	my $debian_mirror = server::conf_default( 'debian_mirror', 'http://ftp.debian.org/debian' );
 
 	if ( ! -e $nfsroot ) {
-		system "apt-get install nfs-kernel-server debootstrap";
+		system "sudo apt-get install nfs-kernel-server debootstrap aufs-modules-`uname -r` aufs-tools";
+		mkdir $nfsroot;
+	}
 
-		if ( ! -e $nfsroot ) {
-			mkdir $nfsroot;
-			system "debootstrap --arch i386 lenny $nfsroot http://ftp.hr.debian.org/debian";
-		}
+	my $debootstrap = "$nfsroot/debootstrap";
 
-		write_file "$nfsroot/tmp/configure.sh", qq{
-echo "do_initrd = Yes" > /etc/kernel-img.conf
+	if ( ! -e $debootstrap ) {
 
-# apt-get install kernel-image-686
-apt-get install atl2-modules-2.6-686
-echo atl2 >> /etc/initramfs-tools/modules
+		system "sudo debootstrap --arch i386 lenny $debootstrap $debian_mirror";
 
-cat /etc/initramfs-tools/initramfs.conf | sed 's/BOOT=local/BOOT=nfs/' > /tmp/initramfs.conf \
-	&& mv /tmp/initramfs.conf /etc/initramfs-tools/initramfs.conf
+		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';
+		in_chroot     $debootstrap => 'apt-get -f install -y --force-yes locales';	# linux-image-2.6-686
 
-update-initramfs -u -v
+		file::append "$debootstrap/etc/initramfs-tools/modules", "atl2\n";
+		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{
 
-		system "chroot $nfsroot sh -x /tmp/configure.sh";
+auto lo
+iface lo inet loopback
 
-		open(my $exports, '>>', '/etc/exports');
-		print $exports "$nfsroot\t$server::ip/$server::netmask(rw,async,no_root_squash,no_subtree_check)\n";
-		close($exports);
+allow-hotplug eth0
+iface eth0 inet dhcp
 
-		system "exportfs -rva";
+		};
 
 	}
 
+	my $export = "$nfsroot/$ip";
+	my $br     = "$nfsroot/br/$ip";
+
+	my $m = $mounted->{$ip} ||= `mount | grep $export`;
+	if ( ! $m ) {
+		warn "mounting $export";
+
+		mkdir "$nfsroot/br"	unless -e "$nfsroot/br";
+		mkdir $br			unless -e $br;
+		mkdir $export		unless -e $export;
+
+		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';
+	}
+
+
 	pxelinux::config_for_ip( $ip, qq{
 
 default nfsroot
 label nfsroot
-	kernel vmlinuz
-	append initrd=initrd.img root=/dev/nfs nfsroot=$server::ip:$nfsroot ro ip=dhcp
+	kernel debootstrap/vmlinuz
+	append initrd=debootstrap/initrd.img root=/dev/nfs nfsroot=$server::ip:$export ro ip=dhcp
 
 	});
 }