From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sun, 16 Aug 2009 22:51:57 +0000 (+0000)
Subject: cleanup audit start
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=c43426fb7e8c5ce1a4d55e266cac637f3584689c;p=pxelator

cleanup audit start
---

diff --git a/lib/PXElator/config.pm b/lib/PXElator/config.pm
index 3d94353..7bfc477 100644
--- a/lib/PXElator/config.pm
+++ b/lib/PXElator/config.pm
@@ -12,6 +12,22 @@ use File::Slurp;
 sub available { qw/debian_live webconverger debirf tinycore/ };
 
 sub debian_live {
+	my ($ip) = @_;
+
+	upstream::files( qw{
+		http://cdimage.debian.org/cdimage/release/current-live/i386/web/
+		vmlinuz1
+		initrd1.img
+		debian-live-501-i386-standard.squashfs
+	});
+
+	pxelinux::config_for_ip( $ip, qq{
+
+default debian_live
+label debian_live
+	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
+
 	$dhcpd::file = "pxelinux.0";
 	$pxelinux::path_prefix = 'live-helper/tftpboot/';
 	$pxelinux::config_file = 'pxelinux.cfg/default';
diff --git a/lib/PXElator/dhcpd.pm b/lib/PXElator/dhcpd.pm
index 141d406..a1bc5de 100644
--- a/lib/PXElator/dhcpd.pm
+++ b/lib/PXElator/dhcpd.pm
@@ -221,7 +221,7 @@ sub start {
 
 	print "DHCP listen on ",$sock->sockhost,":",$sock->sockport,"\n";
 
-	CouchDB::audit( 'start', { 'listen' => { addr => $sock->sockhost, port => $sock->sockport } } );
+	CouchDB::audit( 'start', { addr => $sock->sockhost, port => $sock->sockport } );
 
 	while (1) {
 		process_packet $sock;
diff --git a/lib/PXElator/dnsd.pm b/lib/PXElator/dnsd.pm
index c47a882..0255fd1 100644
--- a/lib/PXElator/dnsd.pm
+++ b/lib/PXElator/dnsd.pm
@@ -106,7 +106,7 @@ sub start {
 		Verbose      => $debug,
 	) || die "couldn't create nameserver object\n";
 
-	CouchDB::audit('start', { listen => { port => 53, domain_name => $server::domain_name } });
+	CouchDB::audit('start', { port => 53, domain_name => $server::domain_name });
 	warn "DNS $server::domain_name";
 
 	$ns->main_loop;