added debian_mirror configuration variable with sensible default

(so you can use Apt-Cacher NG to provide local Debian mirror)
execute /tmp/configure.sh script after debootstrap

diff --git a/lib/PXElator/config.pm b/lib/PXElator/config.pm
index 0baab18..0547905 100644 (file)
--- a/lib/PXElator/config.pm
+++ b/lib/PXElator/config.pm
@@ -102,10 +102,11 @@ sub nfsroot {
        my $ip = shift;
 
        my $nfsroot = "$server::base_dir/tftp/nfsroot";
+       my $debian_mirror = server::conf_default( 'debian_mirror', 'http://ftp.debian.org/debian' );
 
        if ( ! -e $nfsroot ) {
                system "apt-get install nfs-kernel-server debootstrap";
-       
+
                if ( ! -e $nfsroot ) {
                        mkdir $nfsroot;
                        system "debootstrap --arch i386 lenny $nfsroot http://ftp.hr.debian.org/debian";
@@ -125,7 +126,7 @@ update-initramfs -u -v
 
 };
 
-               system "chroot $nfsroot /tmp/configure.sh";
+               system "chroot $nfsroot sh -x /tmp/configure.sh";
 
                open(my $exports, '>>', '/etc/exports');
                print $exports "$nfsroot\t$server::ip/$server::netmask(rw,async,no_root_squash,no_subtree_check)\n";

diff --git a/lib/PXElator/server.pm b/lib/PXElator/server.pm
index 52a9edb..5b66227 100644 (file)
--- a/lib/PXElator/server.pm
+++ b/lib/PXElator/server.pm
@@ -50,6 +50,8 @@ sub shared {
        return $value;
 }
 
+sub conf_default { shared($_[0]) || $_[1] }
+
 sub debug { shared('debug', @_) || 0 }
 
 warn "loaded";

diff --git a/lib/PXElator/t/server.t b/lib/PXElator/t/server.t
index c4faf94..f2deb05 100755 (executable)
--- a/lib/PXElator/t/server.t
+++ b/lib/PXElator/t/server.t
@@ -4,7 +4,7 @@ use warnings;
 use strict;
 use autodie;
 
-use Test::More tests => 3;
+use Test::More tests => 4;
 use Data::Dump qw/dump/;
 
 use_ok 'server';
@@ -13,3 +13,5 @@ ok( my $test = server::shared( 'test', 42 ), 'set shared' );
 diag $test;
 cmp_ok( $test, '==', server::shared( 'test' ), 'get shared' );
 
+cmp_ok( $test, '==', server::conf_default( 'test' ), 'get conf_default' );
+