From: Paul Hänsch <paul@plutz.net>
Date: Wed, 25 Sep 2019 20:06:04 +0000 (+0200)
Subject: mount cdrom into /boot
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=822d07807622ccf9867c63d2aed35d06f66b575a;p=blast

mount cdrom into /boot
---

diff --git a/live.mk b/live.mk
index 330674a..cd7de53 100644
--- a/live.mk
+++ b/live.mk
@@ -7,7 +7,7 @@ iso=live.iso
 # imagesize=3072
 
 ## Additional packages
-packages=firefox-esr,firefox-esr-l10n-de,okular,libreoffice-writer,libreoffice-calc,libreoffice-l10n-de,libreoffice-gnome,hyphen-de,hunspell-de-de-frami,ssh,gparted,vlc,aqemu,qemu-kvm,qemu-utils,mousepad,network-manager-gnome,synaptic,man-db,manpages-de,dolphin,alsa-utils,pulseaudio,pavucontrol,konsole,inkscape,rdesktop,tmux,debootstrap,ntfs-3g,exfat-utils,exfat-fuse,dosfstools,qemu-system-gui,ncat
+packages=firefox-esr,firefox-esr-l10n-de,okular,libreoffice-writer,libreoffice-calc,libreoffice-l10n-de,libreoffice-gnome,hyphen-de,hunspell-de-de-frami,ssh,gparted,vlc,aqemu,qemu-kvm,qemu-utils,mousepad,network-manager-gnome,synaptic,man-db,manpages-de,dolphin,alsa-utils,pulseaudio,pavucontrol,konsole,inkscape,rdesktop,tmux,debootstrap,ntfs-3g,exfat-utils,exfat-fuse,dosfstools,qemu-system-gui,ncat,make
 
 ## Debian release, so far only stretch has been tested
 release=buster
@@ -61,8 +61,9 @@ nodm_user=live
 ## See modules/approx.mk if you need more flexibility
 # approx=http://localhost:9000/debian
 
-.PHONY: _live_initrd _favorites #_kbdlayout #_bootmount
-_config: _live_initrd _favorites #_kbdlayout #_bootmount
+.PHONY: _live_initrd _favorites _bootmount
+_config: _live_initrd _favorites
+_isosquash: _bootmount
 _live_initrd: cfg_root _live_modules
 	# printf '%s\n' "isofs" "squashfs" "ata_generic" "usb_storage" "sr_mod" "mmc_block" >>"$${CFGROOT}/etc/initramfs-tools/modules"
 	sed -i 's;^MODULES=.*$$;MODULES=most;' "$${CFGROOT}/etc/initramfs-tools/initramfs.conf"
@@ -83,8 +84,9 @@ _favorites: _xfce
 	printf 'favorites=libreoffice-startcenter.desktop,firefox-esr.desktop,xfce4-terminal.desktop,org.kde.dolphin.desktop,mousepad.desktop,synaptic.desktop,aqemu.desktop,gparted.desktop' \
 		>"$${CFGROOT}/etc/xdg/xfce4/panel/whiskermenu-10.rc"
 
-# _kbdlayout: cfg_root
-# 	sed -Ei 's;^XKBLAYOUT=.*$$;XKBLAYOUT="de";;' "$${CFGROOT}/etc/default/keyboard"
-
-# _bootmount: cfg_root
-# 	printf '/lib/live/mount/medium	/boot/	bind	auto,bind	0 0\n' >>"$${CFGROOT}/etc/fstab"
+_bootmount: cfg_root _config
+	# mkdir -m 1730 "$${CFGROOT}/var/spool/cron/crontabs/"
+	# chroot "$${CFGROOT}" chgrp crontab "/var/spool/cron/crontabs/"
+	printf '@reboot mkdir -m755 /boot\n' >>"$${CFGROOT}/var/spool/cron/crontabs/root"
+	chmod 600 "$${CFGROOT}/var/spool/cron/crontabs/root"
+	printf '/lib/live/mount/medium	/boot/	bind	auto,bind	0 0\n' >"$${CFGROOT}/etc/fstab"