--- trunk/vz-create.pl	2008/02/08 21:45:37	38
+++ trunk/vz-create.pl	2009/02/27 18:38:19	63
@@ -8,6 +8,7 @@
 use Regexp::Common qw/net/;
 use lib 'lib';
 use VZ;
+use Getopt::Long;
 
 # default debian distribution
 my $dist = 'etch';
@@ -15,14 +16,18 @@
 my $debian_mirror_uri = 'http://www.debian.org/debian';
 my $arh = 'i386';
 # split physicial machine in how meny virtual ones?
-my $ve_total = 4;
+my $split = 4;
 # swap size (Mb)
 my $swap_size = 512;
 # diskspace
 my $diskspace = '2G:4G';
 
-$dist = 'testing';
-$arh = 'amd64';
+GetOptions(
+	'dist=s'	=> \$dist,
+	'arh=s'		=> \$arh,
+	'mirror=s'	=> \$debian_mirror_uri,
+	'split=i'	=> \$split,
+);
 
 check_root;
 
@@ -44,7 +49,7 @@
 
 	if ($arg =~ m/$RE{net}{IPv4}/) {
 		$ip = $arg;
-		if ( my $h = hostname2ip($arg) ) {
+		if ( my $h = ip2hostname($ip) ) {
 			$hostname = $h;
 		}
 	} elsif ($arg) {
@@ -54,8 +59,12 @@
 			$hostname = $arg;
 		}
 	}
+
 }
 
+# nuke arguments so that prompt doesn't get confused
+@ARGV = ();
+
 $ip ||= prompt('Enter IP: ', -require => {
 	'Must be IP (e.g. 192.168.0.1): ' => qr/$RE{net}{IPv4}/,
 }) unless ($ip =~ /$RE{net}{IPv4}/);
@@ -66,9 +75,10 @@
 
 my $ve_id = sprintf('%d%03d', $ip_split[2], $ip_split[3]);
 
-my $vz_root = '/vz';
-
-die "need to know vz_root, and $vz_root doesn't exist: $!\n" unless (-e $vz_root);
+if ( $ve_id < 101 ) {
+	$ve_id += 100;
+	warn "# VEID moved to $ve_id because 0 .. 100 are reserved\n";
+}
 
 print "VEID: $ve_id hostname: $hostname ip: $ip\n";
 
@@ -88,19 +98,13 @@
 	warn "Debian allready installed in $vz_root/private/$ve_id\n";
 }
 
-sub vzctl {
-	my @args = @_;
-	warn "## vzctl ", join(" ",@args), "\n";
-	system "vzctl", @args;
-}
-
-my $conf_path = "/etc/vz/conf/${ve_id}.conf";
+my $conf_path = "$vz_conf/${ve_id}.conf";
 warn ">> creating configuration file $conf_path\n";
 
 if (-e $conf_path) {
 	warn "$conf_path allready exists, not touching it\n";
 } else {
-	vzsplit('-n', $ve_total, '-s', $swap_size * 1024, '>', $conf_path);
+	vzsplit('-n', $split, '-s', $swap_size * 1024, '>', $conf_path);
 
 	die "configuration file not created" unless -e $conf_path;
 
@@ -131,73 +135,19 @@
 
 vzctl('start', $ve_id);
 
-my $customize_sh = <<'__END_OF_SH__';
-
-# use shadow passwords
-pwconv
-
-# upgrade to lastest version
-apt-get -y update
-apt-get -y upgrade
-
-# install additional packages
-apt-get -y --force-yes install vim less ssh sudo screen telnet finger
-
-# remove unwanted packages
-apt-get -y remove nano
-
-# apt-iselect helper
-wget -t 1 -T 5 -O /usr/local/bin/apt-iselect http://www.rot13.org/~dpavlin/projects/scripts/apt-iselect
-chmod 755 /usr/local/bin/apt-iselect
-
-# lock root user
-usermod -L root
-
-# disable getty
-sed -i -e '/getty/d' /etc/inittab
-
-# sane permissions for /root directory
-chmod 700 /root
-
-# disable sync() for syslog
-sed -i -e 's@\([[:space:]]\)\(/var/log/\)@\1-\2@' /etc/syslog.conf
-
-# fix /etc/mtab
-rm -f /etc/mtab
-ln -s /proc/mounts /etc/mtab
-
-# remove unneeded packages
-dpkg --purge modutils
-dpkg --purge ppp pppoeconf pppoe pppconfig
-
-# disable services
-update-rc.d -f klogd remove
-update-rc.d -f quotarpc remove
-update-rc.d -f exim4 remove
-update-rc.d -f inetd remove
-
-# clean packages
-apt-get clean
-
-__END_OF_SH__
-
-foreach my $l (split(/\n/, $customize_sh)) {
-	next if ($l =~ /^\s*$/);
-	if ($l =~ /^#\s+(.+)$/) {
-		warn ">> $1\n";
-	} else {
-		vzctl('exec', $ve_id, $l);
-	}
-}
+runscript( $ve_id, 'custom/00-all.sh' );
 
 #vzctl('stop', $ve_id);
 
-my $passwd = prompt('root passwd: ', -echo=>'*');
-vzctl('set', $ve_id, '--userpasswd', 'root:' . $passwd ) if ($passwd);
+my $passwd = prompt( -prompt => 'root passwd: ', -echo=>'*' );
+vzctl('set', $ve_id, '--userpasswd', 'root:' . $passwd ) if $passwd;
 
 my $login = prompt('create login: ');
 if ($login) {
-	$passwd = prompt("$login passwd: ", -echo=>'*');
+	$passwd = prompt( -prompt => "$login passwd: ", -echo=>'*');
 	vzctl('exec', $ve_id, "useradd --create-home $login");
 	vzctl('set', $ve_id, '--userpasswd', "$login:$passwd" );
 }
+
+#runscript( $ve_id, 'custom/50-hypertable.sh' );
+print "OK: $ve_id created\n";