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

Merge branch 'master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2009-09-17 00:55:04 +02:00
parent 782f908521 d10bbeba71
commit 73252eb319
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/core/31/update.sh
View File

@@ -30,6 +30,9 @@ MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
# Nur den letzten Parameter verwenden
echo $MOUNT > /dev/null
MOUNT=$_
if [ ! $MOUNT == "rw" ]; then
MOUNT="ro"
fi
#
# check if we the backup file already exist
if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then

7
lfs/xen-image
View File

@@ -81,12 +81,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
#Create grub menuentry for pygrub
mkdir $(MNThdd)/boot/grub
echo "title IPFire (XEN-Kernel)" > $(MNThdd)/boot/grub/grub.conf
echo " root(hd0,0)" >> $(MNThdd)/boot/grub/grub.conf
echo " kernel /vmlinuz-$(KVER)-ipfire-xen root=/dev/xvda1 rootdelay=10 panic=10 ro" \
echo "default 1" > $(MNThdd)/boot/grub/grub.conf
echo "title IPFire (XEN-Kernel)" >> $(MNThdd)/boot/grub/grub.conf
echo " kernel /vmlinuz-$(KVER)-ipfire-xen root=/dev/xvda1 rootdelay=10 panic=10 console=xvc0 ro" \
>> $(MNThdd)/boot/grub/grub.conf
echo " initrd /ipfirerd-$(KVER)-xen.img" >> $(MNThdd)/boot/grub/grub.conf
echo " savedefault 1" >> $(MNThdd)/boot/grub/grub.conf
ln -s grub.conf $(MNThdd)/boot/grub/menu.lst
#Copy the meta-info of linux-xen package

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

@@ -43,10 +43,21 @@ cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-xen.conf
#
echo "" >> /boot/grub/grub.conf
echo "title IPFire (XEN-Kernel)" >> /boot/grub/grub.conf
echo " root (hd0,0)" >> /boot/grub/grub.conf
echo " kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT rootdelay=10 panic=10 $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 " savedefault $ENTRY" >> /boot/grub/grub.conf
#
# Test if we running already on xen
#
uname -r ¦ grep "ipfire-xen";
if [ ${?} = 0 ]; then
#Xen Kernel is active
#Set grub default entry to this kernel
sed -i -e "s¦^default saved¦default $ENTRY¦g" /boot/grub/grub.conf
else
#Normal Kernel
#pygrub crash with "default saved"
sed -i -e "s¦^default saved¦#default saved¦g" /boot/grub/grub.conf
fi
#
# Made initramdisk
#