put all customization above debootstrap into rw overlay

(aufs branch), record mounted variations correctly

diff --git a/lib/PXElator/config.pm b/lib/PXElator/config.pm
index 7f452e5..8f06e89 100644 (file)
--- a/lib/PXElator/config.pm
+++ b/lib/PXElator/config.pm
@@ -50,7 +50,7 @@ L<http://webconverger.org/>
 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.2.iso' );
 
        my $homepage = client::conf( $ip => 'homepage', default => "http://${server::ip}:7777/client" );
        my $hostname = client::conf( $ip => 'hostname' ) || 'webconverger';
@@ -109,7 +109,7 @@ sub in_chroot {
 }
 
 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 +133,14 @@ sub nfsroot {
                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 +150,24 @@ iface eth0 inet dhcp
                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
+
+       };
+
 
        pxelinux::config_for_ip( $ip, qq{
 

diff --git a/lib/PXElator/file.pm b/lib/PXElator/file.pm
index ebcb549..35f5272 100644 (file)
--- a/lib/PXElator/file.pm
+++ b/lib/PXElator/file.pm
@@ -56,5 +56,10 @@ sub change {
        }
 }
 
+sub replace {
+       my ( $file, $content ) = @_;
+       mkpath $file;
+       write_file $file, $content;
+}
 
 1;

diff --git a/lib/PXElator/t/file.t b/lib/PXElator/t/file.t
index db7fde8..557f598 100755 (executable)
--- a/lib/PXElator/t/file.t
+++ b/lib/PXElator/t/file.t
@@ -4,7 +4,7 @@ use warnings;
 use strict;
 use autodie;
 
-use Test::More tests => 10;
+use Test::More tests => 11;
 use Data::Dump qw/dump/;
 
 use_ok 'file';
@@ -21,4 +21,6 @@ ok( file::change( $file, 'test' => 'foobar' ), 'change' );
 cmp_ok( -s $file, '>', $size, 'size bigger' );
 ok( ! file::change( $file, 'test' => 'foobar' ), 'change again' );
 
+ok( file::replace( $file, 'replaced content' ), 'replace' );
+
 ok( unlink($file), 'unlink' );