diff --git a/setup.sh b/setup.sh index e35a0e1..333c725 100644 --- a/setup.sh +++ b/setup.sh @@ -215,7 +215,7 @@ echo "systemctl enable zfs-import-bpool.service" >> /mnt/setup-chroot.sh #addgroup --system sambashare echo "echo \"Checking ZFS root...\"" >> /mnt/setup-chroot.sh -echo "zfscheck=`grub-probe /boot 2>&1 1>/dev/null`" >> /mnt/setup-chroot.sh +echo "zfscheck=`grub-probe /boot 2\>\&1 1\>/dev/null`" >> /mnt/setup-chroot.sh echo "if ! [ \"\$?\" = \"0\" ]; then echo \"grub-probe check failed - \$zfscheck\"; exit 2; fi" >> /mnt/setup-chroot.sh echo "echo \"Success.\"" >> /mnt/setup-chroot.sh @@ -225,12 +225,12 @@ echo "update-initramfs -u -k all" >> /mnt/setup-chroot.sh # GRUB_CMDLINE_LINUX="root=ZFS=rpool/ROOT/ubuntu" <--- replace this echo "update-grub">> /mnt/setup-chroot.sh -echo "i=\"0\"">> /mnt/setup-chroot.sh -echo "for f in \"$disks\"; do">> /mnt/setup-chroot.sh -echo "grub-install --target=x86_64-efi --efi-directory=/boot/efi${i} --botloader-id=ubuntu --recheck --no-floppy" >> /mnt/setup-chroot.sh -echo "umount /boot/efi${i}" >> /mnt/setup-chroot.sh -echo "i=$((i + 1))" >> /mnt/setup-chroot.sh -echo "done" >> /mnt/setup-chroot.sh +i="0" +for f in `echo "$disks"`; do + echo "grub-install --target=x86_64-efi --efi-directory=/boot/efi${i} --botloader-id=ubuntu --recheck --no-floppy" >> /mnt/setup-chroot.sh + echo "umount /boot/efi\${i}" >> /mnt/setup-chroot.sh + i=$((i + 1)) +done echo "zfs set mountpoint=legacy bpool/BOOT/ubuntu" >> /mnt/setup-chroot.sh echo "echo \"bpool/BOOT/ubuntu /boot zfs nodev,relatime,x-systemd.requires=zfs-import-bpool.service 0 0\" >> /etc/fstab" >> /mnt/setup-chroot.sh