devuan-sdk
/
live-sdk
mirror of https://github.com/parazyd/live-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ascii.devuan-minimal-live: Indentation fixes

This commit is contained in:
parazyd 2020-11-13 13:55:49 +01:00
parent 964181b57d
commit 830e8525ca
No known key found for this signature in database
GPG Key ID: 6B636BF0493EE747
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
blends/devuan-minimal-live/ascii.devuan-minimal-live.blend
View File

@ -48,7 +48,7 @@ blend_postinst() {
notice "executing $blend_name postinst" notice "executing $blend_name postinst"
# [[ "$mkefi" = "yes" ]] && { # [[ -n "$MKEFI" ]] && {
# iso_make_efi # iso_make_efi
# iso_write_grub_cfg # iso_write_grub_cfg
# } # }
@ -192,15 +192,15 @@ iso_write_grub_cfg() {
# Do the main grub.cfg (which gets loaded last): # Do the main grub.cfg (which gets loaded last):
cat <<EOF | sudo tee ${workdir}/binary/boot/grub/grub.cfg cat <<EOF | sudo tee ${workdir}/binary/boot/grub/grub.cfg
if loadfont $prefix/font.pf2 ; then if loadfont $prefix/font.pf2 ; then
set gfxmode=640x480 set gfxmode=640x480
insmod efi_gop insmod efi_gop
insmod efi_uga insmod efi_uga
insmod video_bochs insmod video_bochs
insmod video_cirrus insmod video_cirrus
insmod gfxterm insmod gfxterm
insmod jpeg insmod jpeg
insmod png insmod png
terminal_output gfxterm terminal_output gfxterm
fi fi
background_image /boot/grub/splash.png background_image /boot/grub/splash.png
@ -209,9 +209,9 @@ set menu_color_highlight=dark-gray/white
set timeout=6 set timeout=6
menuentry "${os}-live (${arch})" { menuentry "${os}-live (${arch})" {
set gfxpayload=keep set gfxpayload=keep
linux /live/vmlinuz boot=live username=$username linux /live/vmlinuz boot=live username=$username
initrd /live/initrd.img initrd /live/initrd.img
} }
menuentry "Other language" { menuentry "Other language" {
@ -221,15 +221,15 @@ menuentry "Other language" {
} }
menuentry "${os}-live (load to RAM)" { menuentry "${os}-live (load to RAM)" {
set gfxpayload=keep set gfxpayload=keep
linux /live/vmlinuz boot=live username=$username toram linux /live/vmlinuz boot=live username=$username toram
initrd /live/initrd.img initrd /live/initrd.img
} }
menuentry "${os}-live (failsafe)" { menuentry "${os}-live (failsafe)" {
set gfxpayload=keep set gfxpayload=keep
linux /live/vmlinuz boot=live username=$username noapic noapm nodma nomce nolapic nosmp vga=normal linux /live/vmlinuz boot=live username=$username noapic noapm nodma nomce nolapic nosmp vga=normal
initrd /live/initrd.img initrd /live/initrd.img
} }
menuentry "Memory test" { menuentry "Memory test" {
@ -293,18 +293,18 @@ sed -i 's/pkgmaster/deb/g'
insserv boot_beep insserv boot_beep
## Configure framebuffer ## Configure framebuffer
setcap 'cap_sys_tty_config+ep' /usr/bin/fbterm setcap 'cap_sys_tty_config+ep' /usr/bin/fbterm
chmod u+s /usr/bin/fbterm chmod u+s /usr/bin/fbterm
## Make initramfs ## Make initramfs
SLIM_INITRD=initrd_devuan.img SLIM_INITRD=initrd_devuan.img
MICRO_INITRD=/boot/initrd.img MICRO_INITRD=/boot/initrd.img
INITRD_COMPR="xz --check=crc32 --x86 -6 -" INITRD_COMPR="xz --check=crc32 --x86 -6 -"
/create_initrd.sh /initrd.img /boot/\${SLIM_INITRD} \ /create_initrd.sh /initrd.img /boot/\${SLIM_INITRD} \
"\${INITRD_COMPR}" \${MICRO_INITRD} "\${INITRD_COMPR}" \${MICRO_INITRD}
rm -f $(realpath /initrd.img) rm -f $(realpath /initrd.img)
rm -f $(realpath /initrd.img.old) rm -f $(realpath /initrd.img.old)
@ -357,13 +357,13 @@ ln -s \${MICRO_INITRD} /boot/initrd.img-\${KERN_ORIG}
EOF EOF
## cp ${strapdir}/finalize ${strapdir}/finalize.bak ## cp ${strapdir}/finalize ${strapdir}/finalize.bak
} }
## func ## func
# put_packages(){ # put_packages(){
# sudo cp -a "$R/extra/custom-packages/" ${strapdir} # sudo cp -a "$R/extra/custom-packages/" ${strapdir}
# } # }
@ -372,9 +372,9 @@ blend_finalize() {
req=(strapdir username default_shell) req=(strapdir username default_shell)
ckreq || return 1 ckreq || return 1
put_create_initrd put_create_initrd
#put_packages #put_packages
put_finalize put_finalize
#chroot-script -d finalize || zerr #chroot-script -d finalize || zerr
@ -384,7 +384,7 @@ blend_finalize() {
sudo cp -L ${strapdir}/boot/initrd.img ${workdir}/binary/live/ sudo cp -L ${strapdir}/boot/initrd.img ${workdir}/binary/live/
printf "done\n" printf "done\n"
printf "copying memtest86 to /binary/live\n" printf "copying memtest86 to /binary/live\n"
sudo cp ${strapdir}/boot/memtest86+.bin ${workdir}/binary/live/memtest sudo cp ${strapdir}/boot/memtest86+.bin ${workdir}/binary/live/memtest
printf "done\n" printf "done\n"
echo "done" echo "done"
} }