DeltaLima/nanodesk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

better EOF handling

Browse source
This commit is contained in:
Marcus 2023-05-01 13:43:30 +02:00
parent 788eb85de1
commit e6ca94674e
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
makeanything.sh
View file

@ -249,7 +249,7 @@ cp build/chroot/boot/vmlinuz-* build/staging/live/vmlinuz || error
cp build/chroot/boot/initrd.img-* build/staging/live/initrd || error cp build/chroot/boot/initrd.img-* build/staging/live/initrd || error
message "isolinux.cfg" message "isolinux.cfg"
cat <<'EOF' >build/staging/isolinux/isolinux.cfg cat <<EOF >build/staging/isolinux/isolinux.cfg
UI vesamenu.c32 UI vesamenu.c32
MENU TITLE Boot Menu MENU TITLE Boot Menu
@ -267,19 +267,19 @@ MENU COLOR msg07 37;40 #90ffffff #a0000000 std
MENU COLOR tabmsg 31;40 #30ffffff #00000000 std MENU COLOR tabmsg 31;40 #30ffffff #00000000 std
LABEL linux LABEL linux
MENU LABEL nanodesk Live [BIOS/ISOLINUX] MENU LABEL nanodesk $VERSION Live [BIOS/ISOLINUX]
MENU DEFAULT MENU DEFAULT
KERNEL /live/vmlinuz KERNEL /live/vmlinuz
APPEND initrd=/live/initrd boot=live APPEND initrd=/live/initrd boot=live
LABEL linux LABEL linux
MENU LABEL nanodesk Live [BIOS/ISOLINUX] (nomodeset) MENU LABEL nanodesk $VERSION Live [BIOS/ISOLINUX] (nomodeset)
MENU DEFAULT MENU DEFAULT
KERNEL /live/vmlinuz KERNEL /live/vmlinuz
APPEND initrd=/live/initrd boot=live nomodeset APPEND initrd=/live/initrd boot=live nomodeset
EOF EOF
cat <<'EOF' > build/staging/boot/grub/grub.cfg cat <<EOF > build/staging/boot/grub/grub.cfg
insmod part_gpt insmod part_gpt
insmod part_msdos insmod part_msdos
insmod fat insmod fat
@ -293,16 +293,16 @@ set timeout=30
# If X has issues finding screens, experiment with/without nomodeset. # If X has issues finding screens, experiment with/without nomodeset.
menuentry "nanodesk Live [EFI/GRUB]" { menuentry "nanodesk $VERSION Live [EFI/GRUB]" {
search --no-floppy --set=root --label NANODESK search --no-floppy --set=root --label NANODESK
linux ($root)/live/vmlinuz boot=live linux (\$root)/live/vmlinuz boot=live
initrd ($root)/live/initrd initrd (\$root)/live/initrd
} }
menuentry "nanodesk Live [EFI/GRUB] (nomodeset)" { menuentry "nanodesk $VERSION Live [EFI/GRUB] (nomodeset)" {
search --no-floppy --set=root --label NANODESK search --no-floppy --set=root --label NANODESK
linux ($root)/live/vmlinuz boot=live nomodeset linux (\$root)/live/vmlinuz boot=live nomodeset
initrd ($root)/live/initrd initrd (\$root)/live/initrd
} }
EOF EOF

14
src/root/install_nanodesk.sh
View file

@ -119,16 +119,16 @@ message "creating /boot directory"
mkdir -p /mnt/boot/ || error mkdir -p /mnt/boot/ || error
message "create tmp script for reinstalling grub and kernel" message "create tmp script for reinstalling grub and kernel"
cat <<EOF > /mnt/tmp/reinstall_kernel.sh cat <<\EOF > /mnt/tmp/reinstall_kernel.sh
DEBIAN_FRONTEND=noninteractive DEBIAN_FRONTEND=noninteractive
export DEBIAN_FRONTEND export DEBIAN_FRONTEND
#/usr/bin/apt --yes purge 'linux-image-*' 'grub-*' #/usr/bin/apt --yes purge 'linux-image-*' 'grub-*'
/usr/bin/apt --yes --reinstall install \\ /usr/bin/apt --yes --reinstall install \
linux-image-amd64 \\ linux-image-amd64 \
linux-image-5.10.0-22-amd64 \\ linux-image-5.10.0-22-amd64 \
grub-pc grub-pc-bin \\ grub-pc grub-pc-bin \
grub-common \\ grub-common \
grub2-common \\ grub2-common \
os-prober os-prober
EOF EOF