webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Xen Image now use pygrub to load ramdisk and kernel inside of the image

Browse Source 
Removed kernel/initrd outside of the xen-image
Fix savedefault handling
This commit is contained in:
Arne Fitzenreiter
2009-09-17 14:59:18 +02:00
parent d10bbeba71
commit aa7304005c
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/xen-image/ipfire.cfg
View File

@@ -1,5 +1,7 @@
kernel = "/mnt/test/boot/vmlinuz-KVER-ipfire-xen" #### change path #kernel = "/mnt/test/boot/vmlinuz-KVER-ipfire-xen" #### change path
ramdisk ="/mnt/test/boot/ipfirerd-KVER-xen.img" #### change path #ramdisk ="/mnt/test/boot/ipfirerd-KVER-xen.img" #### change path
bootloader = '/usr/bin/pygrub'
memory = 128 memory = 128
name = "ipfire-xen" name = "ipfire-xen"
@@ -21,5 +23,5 @@ disk = [
'file:/mnt/test/swap.img,xvdb1,w' 'file:/mnt/test/swap.img,xvdb1,w'
] #### Change path ] #### Change path
root = "/dev/xvda1" #root = "/dev/xvda1"
extra = 'xencons=tty console=hvc0 clocksource=jiffies ro' #extra = 'xencons=tty console=hvc0 clocksource=jiffies ro'

12
lfs/xen-image
View File

@@ -54,7 +54,7 @@ SIZEswap := 512
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
rm -rf $(MNThdd) $(IMGinst) $(IMGroot) && mkdir -p $(MNThdd) rm -rf $(MNThdd) $(IMGinst) $(IMGroot) && mkdir -p $(MNThdd)
mkdir -p /install/images/$(SNAME)/boot mkdir -p /install/images/$(SNAME) # /boot
#Create swapimage #Create swapimage
dd bs=1M if=/dev/zero of=$(IMGswap) count=$(SIZEswap) dd bs=1M if=/dev/zero of=$(IMGswap) count=$(SIZEswap)
@@ -86,6 +86,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
echo " kernel /vmlinuz-$(KVER)-ipfire-xen root=/dev/xvda1 rootdelay=10 panic=10 console=xvc0 ro" \ echo " kernel /vmlinuz-$(KVER)-ipfire-xen root=/dev/xvda1 rootdelay=10 panic=10 console=xvc0 ro" \
>> $(MNThdd)/boot/grub/grub.conf >> $(MNThdd)/boot/grub/grub.conf
echo " initrd /ipfirerd-$(KVER)-xen.img" >> $(MNThdd)/boot/grub/grub.conf echo " initrd /ipfirerd-$(KVER)-xen.img" >> $(MNThdd)/boot/grub/grub.conf
echo "# savedefault 0" >> $(MNThdd)/boot/grub/grub.conf
ln -s grub.conf $(MNThdd)/boot/grub/menu.lst ln -s grub.conf $(MNThdd)/boot/grub/menu.lst
#Copy the meta-info of linux-xen package #Copy the meta-info of linux-xen package
@@ -150,10 +152,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
$(MNThdd)/opt/pakfire/etc/pakfire.conf $(MNThdd)/opt/pakfire/etc/pakfire.conf
#Copy initramdisk, kernel and config #Copy initramdisk, kernel and config
cp -f $(MNThdd)/boot/ipfirerd-$(KVER)-xen.img \ #cp -f $(MNThdd)/boot/ipfirerd-$(KVER)-xen.img \
/install/images/$(SNAME)/boot # /install/images/$(SNAME)/boot
cp -f $(MNThdd)/boot/vmlinuz-$(KVER)-ipfire-xen \ #cp -f $(MNThdd)/boot/vmlinuz-$(KVER)-ipfire-xen \
/install/images/$(SNAME)/boot # /install/images/$(SNAME)/boot
cp $(DIR_SRC)/config/xen-image/* \ cp $(DIR_SRC)/config/xen-image/* \
/install/images/$(SNAME) /install/images/$(SNAME)
sed -i -e "s|KVER|$(KVER)|g" /install/images/$(SNAME)/ipfire.cfg sed -i -e "s|KVER|$(KVER)|g" /install/images/$(SNAME)/ipfire.cfg

7
src/paks/linux-xen/install.sh
View File

@@ -45,18 +45,19 @@ echo "" >> /boot/grub/grub.conf
echo "title IPFire (XEN-Kernel)" >> /boot/grub/grub.conf echo "title IPFire (XEN-Kernel)" >> /boot/grub/grub.conf
echo " kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT rootdelay=10 panic=10 console=xvc0 $MOUNT" >> /boot/grub/grub.conf echo " kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT rootdelay=10 panic=10 console=xvc0 $MOUNT" >> /boot/grub/grub.conf
echo " initrd /ipfirerd-$KVER-xen.img" >> /boot/grub/grub.conf echo " initrd /ipfirerd-$KVER-xen.img" >> /boot/grub/grub.conf
echo "# savedefault $ENTRY" >> /boot/grub/grub.conf
# #
# Test if we running already on xen # Test if we running already on xen
# #
uname -r ¦ grep "ipfire-xen"; uname -r | grep "ipfire-xen";
if [ ${?} = 0 ]; then if [ ${?} = 0 ]; then
#Xen Kernel is active #Xen Kernel is active
#Set grub default entry to this kernel #Set grub default entry to this kernel
sed -i -e "s¦^default saved¦default $ENTRY¦g" /boot/grub/grub.conf sed -i -e "s|^default saved|default $ENTRY|g" /boot/grub/grub.conf
else else
#Normal Kernel #Normal Kernel
#pygrub crash with "default saved" #pygrub crash with "default saved"
sed -i -e "s¦^default saved¦#default saved¦g" /boot/grub/grub.conf sed -i -e "s|^default saved|#default saved|g" /boot/grub/grub.conf
fi fi
# #
# Made initramdisk # Made initramdisk