From: Paul Hänsch <paul@plutz.net>
Date: Tue, 26 Nov 2019 01:16:36 +0000 (+0100)
Subject: include Debian installer (replaced Libreoffice by Abiword to make space)
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=696232d2b10f58b39b2bafd53128dd66b7190ca8;p=blast

include Debian installer (replaced Libreoffice by Abiword to make space)
---

diff --git a/live.mk b/live.mk
index cd7de53..37ae10a 100644
--- a/live.mk
+++ b/live.mk
@@ -7,7 +7,8 @@ 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,make
+packages=firefox-esr,firefox-esr-l10n-de,okular,ssh,gparted,qemu-kvm,mousepad,network-manager-gnome,synaptic,man-db,manpages-de,alsa-utils,pulseaudio,pavucontrol,rdesktop,tmux,debootstrap,ntfs-3g,exfat-utils,exfat-fuse,dosfstools,qemu-system-gui,ncat,make,dnsutils,telnet,debian-installer-launcher,aqemu,qemu-utils,vlc,dolphin,konsole,abiword,gnumeric,gnumeric-plugins-extra,fonts-liberation,aspell-de,frozen-bubble,kpat
+# packages += ,libreoffice-writer,libreoffice-calc,libreoffice-l10n-de,libreoffice-gnome,hyphen-de,hunspell-de-de-frami
 
 ## Debian release, so far only stretch has been tested
 release=buster
@@ -67,8 +68,10 @@ _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"
+	sed -i 's;^COMPRESS=.*$$;COMPRESS=xz;' "$${CFGROOT}/etc/initramfs-tools/initramfs.conf"
 
 _config: cfg_root/usr/share/kxmlgui5/dolphin/dolphinui.rc
+_config: cfg_root/usr/local/bin/gksu
 
 cfg_root/usr/share/kxmlgui5/dolphin/dolphinui.rc: cfg_root _xfce
 	mkdir -p "$(dir $@)"
@@ -80,13 +83,13 @@ cfg_root/usr/share/kxmlgui5/dolphin/dolphinui.rc: cfg_root _xfce
 			'</kpartgui>' \
 		>$@
 
+cfg_root/usr/local/bin/gksu:
+	ln -s /usr/bin/sudo $@
+	ln -s /usr/bin/sudo $@do
+
 _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"
 
 _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"
+	printf '/lib/live/mount/medium	/boot/	bind	auto,bind	0 0\n' >>"$${CFGROOT}/etc/fstab"