Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next

[people/pmueller/ipfire-2.x.git] / src / paks / linux-xen / install.sh

diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh
index 4457e5eddbf9ede4384f4c8113ca0756ea12bbb3..8b46c89cf230413e7ee6fc6f852cc5a20201377c 100644 (file)
--- a/src/paks/linux-xen/install.sh
+++ b/src/paks/linux-xen/install.sh
@@ -25,11 +25,20 @@
 extract_files
 #
 KVER=2.6.32.24
-ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
+ROOT=`mount | grep " / " | cut -d" " -f1`
+ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
+if [ ! -z $ROOTUUID ]; then
+       ROOT="UUID=$ROOTUUID"
+fi
+
 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
+
 ENTRY=`grep "savedefault" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
 echo $ENTRY > /dev/null
@@ -64,9 +73,7 @@ fi
 #
 # Made initramdisk
 #
-cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
-sed -i -e "s| autodetect | |g" /etc/mkinitcpio.conf
-mkinitcpio -k $KVER-ipfire-xen -g /boot/ipfirerd-$KVER-xen.img
+/sbin/dracut --force --verbose /boot/ipfirerd-$KVER-xen.img $KVER-ipfire-xen
 #
 # Create new module depency
 #