diff --git a/installer/installer.sh b/installer/installer.sh
index abb56d2..f61a8af 100755
--- a/installer/installer.sh
+++ b/installer/installer.sh
@@ -518,11 +518,11 @@ if [ "$INSTALL_BOOTLOADER_DEVICE" -o "$INSTALL_BOOTLOADER_DEVICE_EFI" ]; then
    mount -o bind /mnt $MOUNTPOINT/mnt
    mount -o bind /var/run/dbus $MOUNTPOINT/var/run/dbus
    for d in /mnt/*; do
-      [ -d $d ] && mount -o bind,ro $d ${MOUNTPOINT}${d}
+      [ -d $d -a "$d" != "${MOUNTPOINT}" ] && mount -o bind $d ${MOUNTPOINT}${d}
    done
-   chroot $MOUNTPOINT grub-mkconfig -o /boot/grub/grub.cfg
+   chroot $MOUNTPOINT update-grub
    for d in /mnt/*; do
-      [ -d $d ] && umount ${MOUNTPOINT}${d}
+      [ -d $d -a "$d" != "${MOUNTPOINT}" ] && umount ${MOUNTPOINT}${d}
    done
    umount $MOUNTPOINT/var/run/dbus
    umount $MOUNTPOINT/mnt