X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=Makefile;h=708fbcba028d5f848ebbf5f3ff18091af9b3b260;hb=0d197fdc9e6d296252e400789935fa5b55ef0176;hp=453fa6af0fe4c3f48a31251b0903fcae49c223ff;hpb=e926f81d2b0222eb366b13d0ef5634b1590d3b81;p=blast

diff --git a/Makefile b/Makefile
index 453fa6a..708fbcb 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ else ifdef subvol
   _config: _copy
 
   ${subvol}: _config
-	btrfs sub snap "${CFG_ROOT}" "$@"
+	btrfs sub snap "${CFGROOT}" "$@"
 
 else ifdef squash
   SQUASH := ${squash}
@@ -237,6 +237,7 @@ ${SYSROOT}/etc/apt/apt.conf.d/10norecommends: ${SYSROOT}
 ${SYSROOT}/etc/apt/trusted.gpg.d/: ${SYSROOT} _bootstrap
 	mkdir -p -m 755 "$@"
 	cp keys/*.gpg "$@"
+	chmod 644 "$@"/*.gpg
 
 _install: ${SYSROOT} _aptkeys _norecommends
 	printf '%s\n' "$${SOURCES}" |sort -u >"$${SYSROOT}/etc/apt/sources.list"
@@ -380,10 +381,12 @@ _bootloader_pc: ${CFGROOT} _grub_efi32 _grub_efi64 _syslinux_bios #_syslinux_efi
 _bootloader_iso: ${CFGROOT} ${ISOROOT}
 	mkdir -p "$${ISOROOT}/boot/grub/"
 	cp -L "$${CFGROOT}/vmlinuz" "$${CFGROOT}/initrd.img" "$${ISOROOT}"
+	printf '%s\n' "insmod all_video" "set gfxmode=auto" "load_video" "insmod gfxterm" \
+		>"$${ISOROOT}/boot/grub/grub.cfg"
 	printf '%s\n' "set timeout=10" "default=buster" \
 		"menuentry 'Debian Buster' --id 'buster' {" \
 		"linux '/vmlinuz' boot=live" "initrd '/initrd.img'" "}" \
-		>"$${ISOROOT}/boot/grub/grub.cfg"
+		>>"$${ISOROOT}/boot/grub/grub.cfg"
 	-[ -f "$${ISOROOT}/install/initrd.gz" -a -f "$${ISOROOT}/install/linux" ] && \
 	printf '%s\n' "menuentry 'Install Debian' --id 'install' {" \
 		"linux '/install/linux'" "initrd '/install/initrd.gz'" "}" \