X-Git-Url: https://git.rapsys.eu/distgen/blobdiff_plain/6d2ea3b7342187b1d5209f1d1efef79427471c80..eb11babe9f1cd3766c1d7a5f67a06d0f88d55d04:/lib/boot.sh

diff --git a/lib/boot.sh b/lib/boot.sh
index 021a384..0e4186f 100644
--- a/lib/boot.sh
+++ b/lib/boot.sh
@@ -3,6 +3,12 @@
 # Bind mount /dev
 mount --bind /dev ${MOUNTPOINT}/dev
 
+# Bind mount /proc
+mount --bind /proc ${MOUNTPOINT}/proc
+
+# Bind mount /sys
+mount --bind /sys ${MOUNTPOINT}/sys
+
 # Backup old mtab
 mv ${MOUNTPOINT}/etc/mtab ${MOUNTPOINT}/etc/mtab.orig
 
@@ -10,38 +16,21 @@ mv ${MOUNTPOINT}/etc/mtab ${MOUNTPOINT}/etc/mtab.orig
 #cat /proc/self/mounts | grep -E '^(/dev/m|devtmpfs)' | perl -pne 's%/media(/?)%$1%' | sort | uniq > /media/etc/mtab
 perl -pne "/^(devtmpfs \\/dev|\\/dev\\/(md|dm|mapper))/ || undef \$_; s%${MOUNTPOINT}/?%/%" /proc/self/mounts > ${MOUNTPOINT}/etc/mtab
 
-# Backup old device.map
-mv ${MOUNTPOINT}/boot/grub/device.map ${MOUNTPOINT}/boot/grub/device.map.orig
-
-# Install grub
-for i in $LOOPB $LOOPA; do
-	# Create new device map
-	echo "(hd0)	$i" > ${MOUNTPOINT}/boot/grub/device.map
-
-	# Fix grub
-	#XXX: e2fs_stage1_5 is 20 sectors embedded, but it fail with gpt
-	#XXX: we use install command directly instead of setup (hd0) because it fail with loop
-	cat << EOF | chroot ${MOUNTPOINT} grub --device-map=/boot/grub/device.map
-root (hd0,0)
-install --stage2=/boot/grub/stage2 /grub/stage1 (hd0) /grub/stage2 p /grub/menu.lst
-EOF
-done
-
-# Restore old device.map
-mv -f ${MOUNTPOINT}/boot/grub/device.map.orig ${MOUNTPOINT}/boot/grub/device.map
-
-# Bind mount /proc
-mount --bind /proc ${MOUNTPOINT}/proc
-
-# Bind mount /sys
-mount --bind /sys ${MOUNTPOINT}/sys
-
 # Extract last kernel version
 KVER=`chroot ${MOUNTPOINT} rpm -qa | perl -pne '/kernel-server-latest/||undef $_;s%^kernel-(server)-latest-([^-]+)-(.+)$%\2-\1-\3%'`
+
 # Regenerate initrd
 #XXX: force non hostonly else it don't store commandline : rd.luks.uuid rd.md.uuid ip=dhcp rd.neednet=1
 DRACUT_SKIP_FORCED_NON_HOSTONLY=1 chroot ${MOUNTPOINT} mkinitrd -f /boot/initrd-${KVER}.img ${KVER}
 
+# Generate grub config
+chroot ${MOUNTPOINT} grub2-mkconfig -o /boot/grub2/grub.cfg
+
+# Install grub
+for i in $LOOPB $LOOPA; do
+	chroot ${MOUNTPOINT} grub2-install $i
+done
+
 # Umount dev
 umount ${MOUNTPOINT}/sys
 
@@ -54,5 +43,8 @@ umount ${MOUNTPOINT}/dev
 # Reset mtab
 mv -f ${MOUNTPOINT}/etc/mtab.orig ${MOUNTPOINT}/etc/mtab
 
+# Umount home
+umount ${MOUNTPOINT}/home
+
 # Umount boot
 umount ${MOUNTPOINT}/boot