merged updates from master

[blast] / live.mk

diff --git a/live.mk b/live.mk
index d53d7b5ffe0ceeb3e7c69ce96f70d8a3b207e4dc..37ae10a6ba5ca19b11ff7101a9ec1769d2f14663 100644 (file)
--- a/live.mk
+++ b/live.mk
@@ -7,8 +7,8 @@ iso=live.iso
 # imagesize=3072
 
 ## Additional packages
-# packages=chromium,chromium-sandbox,chromium-l10n,okular,libreoffice-writer,libreoffice-calc,libreoffice-l10n-de,libreoffice-gnome,hyphen-de,hunspell-de-de-frami,ssh,gparted,vlc,aqemu,qemu-kvm,leafpad,network-manager-gnome,synaptic,man,manpages-de,dolphin
-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
+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
@@ -45,6 +45,8 @@ timezone=Europe/Berlin
 ## Comma separated list of locales, first one will become default locale
 locales=de_DE.UTF-8 #,en_US.UTF-8
 
+keyboard=de
+
 ## If nodm is installed, you can choose a user to login automatically
 ## If no user is given here, then nodm will default to root
 nodm_user=live
@@ -60,13 +62,16 @@ nodm_user=live
 ## See modules/approx.mk if you need more flexibility
 # approx=http://localhost:9000/debian
 
-.PHONY: _live_initrd _favorites #_bootmount
-_config: _live_initrd _favorites #_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"
+       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 $@)"
@@ -78,9 +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
-#      printf '/lib/live/mount/medium  /boot/  bind    auto,bind       0 0\n' >>"$${CFGROOT}/etc/fstab"
+_bootmount: cfg_root _config
+       printf '/lib/live/mount/medium  /boot/  bind    auto,bind       0 0\n' >>"$${CFGROOT}/etc/fstab"