Some work on xen-image

diff --git a/config/xen-image/README b/config/xen-image/README
index 9a9c2f5e9123dbac1ee49670d28efa166e7fc6c2..9394c5cf551b9493783f2d1935306de57653caaa 100644 (file)
--- a/config/xen-image/README
+++ b/config/xen-image/README
@@ -3,8 +3,8 @@ Howto install Ipfire as a paravirtualized DomU:
 - download image
 - extract the downloaded file, be careful, you need at least 4gb
 - edit the file ipfire.cfg
-- start ipfire:  "xm create -c ipfire.cfg"
-- go to console: "xm console ipfire-xen"
+- start ipfire:  "xm create ipfire.cfg"
+- if you get no errormessage go to console: "xm console ipfire-xen"
 - after booting, the setup will started to do basic settings and reboot
 
 This setup is for 2 interfaces (green and red). if you want more, like orange and blue, edit the ipfire.cfg and execute "setup" to adjust yout config.
@@ -19,7 +19,4 @@ other usefull commands from the Dom0:
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 Todo:
-- prevent loading some modules like ac, battery and so on
-- remove setclock initscript
-- remove keymap initscript
-- add hvc0 to /etc/securetty
+- check Xen Kernel config (filesystems should not included to kernel!!!!)

diff --git a/config/xen-image/ipfire.cfg b/config/xen-image/ipfire.cfg
index cc1ac446d299fce988db31ddd88d69677c1399d5..185473763513d996276966cc970cc6cf28748cb0 100644 (file)
--- a/config/xen-image/ipfire.cfg
+++ b/config/xen-image/ipfire.cfg
@@ -22,4 +22,4 @@ disk = [
        ] #### Change path
 
 root = "/dev/xvda1"
-extra =  'xencons=tty console=hvc0 clocksource=jiffies'
+extra =  'xencons=tty console=hvc0 clocksource=jiffies ro'

diff --git a/lfs/cdrom b/lfs/cdrom
index 0773547ae43d37e6351e62ca061a90ba34953a96..5fa6730f2277133e50c76fc7dd10fb4e66c6e0a3 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -48,6 +48,9 @@ md5 :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        rm -rf /install/cdrom /tmp/*
 
+       #Clear mtab (prevents .journal problems)
+       echo > /etc/mtab
+
        # Compress root filesystem
        # Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
        mkdir -p /install/cdrom/doc

diff --git a/lfs/xen-image b/lfs/xen-image
index 4da844c65384ed08f0e755e69fe927a1c0b4effb..ec824d0ae68fd7adf3addd0070bf1df248f2d22b 100644 (file)
--- a/lfs/xen-image
+++ b/lfs/xen-image
@@ -64,8 +64,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        dd bs=1M if=/dev/zero of=$(IMGroot) count=$(SIZEroot)
        mkfs.ext3 -F $(IMGroot)
 
-       # Mount Images (ext3 mount create a inaccessible ".journal"
-       mount -o loop -t ext2 $(IMGroot) $(MNThdd)
+       # Mount Images
+       mount -o loop $(IMGroot) $(MNThdd)
        mkdir $(MNThdd)/boot
        mkdir $(MNThdd)/var
        mkdir $(MNThdd)/var/log
@@ -115,6 +115,23 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        #Remove root / fstab check
        rm -rf $(MNThdd)/etc/rc.d/rcsysinit.d/S19checkfstab
 
+       #Add xvc0 to securetty
+       echo xvc0 >> $(MNThdd)/etc/securetty
+
+       #Disable some initskripts
+       echo "#!/bin/sh" > $(MNThdd)/etc/rc.d/init.d/setclock
+       echo "#!/bin/sh" > $(MNThdd)/etc/rc.d/init.d/keymap
+
+       #Remove autoload of some acpi modules
+       sed -i -e "s|^ac|#ac|g" $(MNThdd)/etc/sysconfig/modules
+       sed -i -e "s|^battery|#battery|g" $(MNThdd)/etc/sysconfig/modules
+       sed -i -e "s|^button|#button|g" $(MNThdd)/etc/sysconfig/modules
+       sed -i -e "s|^fan|#fan|g" $(MNThdd)/etc/sysconfig/modules
+
+       #Change pakfire trunk
+       sed -i -e "s|$(VERSION)|$(VERSION)-xen|g" \
+               $(MNThdd)/opt/pakfire/etc/pakfire.conf
+
        #Copy initramdisk, kernel and config
        cp -f $(MNThdd)/boot/ipfirerd-$(KVER)-xen.img \
                /install/images/$(SNAME)/boot