Merge remote-tracking branch 'mfischer/smartmontools' into next

[people/pmueller/ipfire-2.x.git] / config / xen-image / ipfire.cfg

diff --git a/config/xen-image/ipfire.cfg b/config/xen-image/ipfire.cfg
index 185473763513d996276966cc970cc6cf28748cb0..38bfdff5e5146aa6f182f1cacc051bab1d5bb43a 100644 (file)
--- a/config/xen-image/ipfire.cfg
+++ b/config/xen-image/ipfire.cfg
@@ -1,13 +1,13 @@
-kernel = "/mnt/test/boot/vmlinuz-KVER-ipfire-xen"    #### change path
-ramdisk ="/mnt/test/boot/ipfirerd-KVER-xen.img"      #### change path
+bootloader = '/usr/bin/pygrub'
 
-memory = 128
+memory = 256
 name = "ipfire-xen"
 
 acpi=1
 apic=1
 
 ### network: do not change the mac adresses and never use your real mac adresse of your hardware here!! ###
+### the bridge must be present on you xen-system. Check the names!!! ###
 vif         = [
                   'mac=00:17:3E:BE:A1:1A, bridge=xenbrI',      ## Green
                   'mac=00:17:3E:BE:A1:1B, bridge=xenbrE',      ## Red
@@ -17,9 +17,8 @@ vif         = [
 
 
 disk = [
-               'file:/mnt/test/ipfire.img,xvda1,w', 
-               'file:/mnt/test/swap.img,xvdb1,w'
+               'file:./ipfire-boot.img,xvda1,w',
+               'file:./ipfire-swap.img,xvda2,w',
+               'file:./ipfire-root.img,xvda3,w',
+               'file:./ipfire-var.img,xvda4,w'
        ] #### Change path
-
-root = "/dev/xvda1"
-extra =  'xencons=tty console=hvc0 clocksource=jiffies ro'