From f91838de6070e57b65a18da864ddb02416b72bfb Mon Sep 17 00:00:00 2001
From: Dave Simons <dave@inuits.be>
Date: Tue, 12 Jul 2011 09:17:11 +0200
Subject: [PATCH] some work on arch64 install through AIF

Signed-off-by: Dave Simons <dave@inuits.be>
---
 .../archlinux-64-aif-experimental/aif.cfg     | 23 +++++++++++++++++++
 .../definition.rb                             | 10 ++++----
 .../postinstall.sh                            |  5 +---
 3 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 templates/archlinux-64-aif-experimental/aif.cfg

diff --git a/templates/archlinux-64-aif-experimental/aif.cfg b/templates/archlinux-64-aif-experimental/aif.cfg
new file mode 100644
index 00000000..e014cee0
--- /dev/null
+++ b/templates/archlinux-64-aif-experimental/aif.cfg
@@ -0,0 +1,23 @@
+# Archlinux AIF config file
+# created by Dave Simons
+# 11/07/2011
+
+# install source
+SOURCE=cd
+FILE_URL=file:///src/core/pkg
+
+# time/date
+HARDWARECLOCK=localtime
+TIMEZONE=Europe/Brussels
+
+# packages to install
+TARGET_GROUPS=base
+TARGET_PACKAGES='openssh vim ruby rubygems'
+TARGET_PACKAGES_EXCLUDE='nano emacs'
+
+# hard drive setup
+GRUB_DEVICE='/dev/sda'
+PARTITIONS='/dev/sda 100:ext2:+ 512:swap *:ext4'
+BLOCKDATA='/dev/sda1 raw no_label ext2;yes;/boot;target;no_opts;no_label;no_params
+/dev/sda2 raw no_label swap;yes;no_mountpoint;target;no_opts;no_label;no_params
+/dev/sda3 raw no_label ext4;yes;/;target;no_opts;no_label;no_params'
diff --git a/templates/archlinux-64-aif-experimental/definition.rb b/templates/archlinux-64-aif-experimental/definition.rb
index 140c7d7d..a7e05207 100644
--- a/templates/archlinux-64-aif-experimental/definition.rb
+++ b/templates/archlinux-64-aif-experimental/definition.rb
@@ -6,23 +6,23 @@
   :iso_src => "http://archlinux.mirror.kangaroot.net/iso/2010.05/archlinux-2010.05-core-x86_64.iso",
   :iso_md5 => "9e9057702af5826a3b924233bf44fe66",
   :iso_download_timeout => "1000",
-  :boot_wait => "5", :boot_cmd_sequence => [
+  :boot_wait => "6", :boot_cmd_sequence => [
     '<Enter>',
     '<Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait>',
     '<Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait>',
     '<Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait>',
-    'root<Enter>',
+	'root<Enter>',
     'dhcpcd eth0<Enter><Wait><Wait>',
     'echo "sshd: ALL" > /etc/hosts.allow<Enter>',
     'passwd<Enter>',
     'vagrant<Enter>',
     'vagrant<Enter>',
     '/etc/rc.d/sshd start<Enter><Wait>',
-    'echo "Now we continue with the post-install.sh"<Enter>',
+	'sleep 3 && wget 10.0.2.2:7122/aif.cfg<Enter>',
   ],
-  :kickstart_port => "7122", :kickstart_timeout => "10000", :kickstart_file => "",
+  :kickstart_port => "7122", :kickstart_timeout => "10000", :kickstart_file => "aif.cfg",
   :ssh_login_timeout => "10000", :ssh_user => "root", :ssh_password => "vagrant", :ssh_key => "",
-  :ssh_host_port => "7222", :ssh_guest_port => "22",
+  :ssh_host_port => "7224", :ssh_guest_port => "22",
   :sudo_cmd => "sh '%f'",
   :shutdown_cmd => "shutdown -H",
   :postinstall_files => [ "postinstall.sh"], :postinstall_timeout => "10000"
diff --git a/templates/archlinux-64-aif-experimental/postinstall.sh b/templates/archlinux-64-aif-experimental/postinstall.sh
index 3a213c26..1ef81351 100644
--- a/templates/archlinux-64-aif-experimental/postinstall.sh
+++ b/templates/archlinux-64-aif-experimental/postinstall.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
 
-echo ""
-echo "Now we can run the sequence for installing arch"
-echo "f.i. do an aif install based from templates"
-echo "Dave Simons will help you :)"
+su -c 'aif -p automatic -c aif.cfg'