X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/0ffed154936f329bcc1500e506f1d78c99b2d79e..0190ebf09310261b1988c0a36d5be764370c4d95:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 32a760e..6b39d2d 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -78,6 +78,10 @@ build_rootfs()
 
         cd testing
 
+        rm etc/fstab
+
+        mkdir -p boot/efi
+
         sudo bash -c 'echo live > etc/hostname'
 
         sudo bash -c 'echo > etc/motd'
@@ -128,6 +132,7 @@ build_dd()
         tune2fs -O extents,uninit_bg,dir_index -m 0 -c 0 -i 0 media
         sudo mount -o loop media mnt
         sudo cp -a testing/* mnt/
+        sudo touch /mnt/etc/fstab
         sudo rm mnt/init
         sudo umount mnt
         tar cf - media | pigz > m1.tgz
@@ -137,18 +142,17 @@ build_dd()
 build_efi()
 {
 (
-        rm -f EFI
-        mkdir -p EFI/BOOT
+        rm -rf EFI
+        mkdir -p EFI/boot EFI/debian
         cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi EFI/boot/bootaa64.efi
 
         export INITRD=`ls -1 testing/boot/ | grep initrd`
         export VMLINUZ=`ls -1 testing/boot/ | grep vmlinuz`
-        export UUID=`disktype build/media | grep UUID | awk '{print $2}'`
-        cat > EFI/boot/grub.cfg <<EOF
+        export UUID=`blkid media | awk -F\" '{print $2}'`
+        cat > EFI/debian/grub.cfg <<EOF
 search.fs_uuid ${UUID} root
-set prefix=(\$root)'/boot/'
-linux $VMLINUZ root=UUID=${UUID} ro
-inird $INITRD
+linux (\$root)/boot/${VMLINUZ} root=UUID=${UUID} rw
+initrd (\$root)/boot/${INITRD}
 boot
 EOF
         tar czf efi.tgz EFI