diff --git a/LICENSE b/LICENSE index 2a33b15..ebeb80c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,3 @@ -- `*`: GNU GPL-3.0 -- `config/includes.chroot/usr/share/backgrounds/futureprototype-darker-4096x2160`.svg: (c) 2018 Alex Makas, GNU GPL-3.0 -- `config/includes.chroot/usr/share/backgrounds/homeworld-darker-3840x2160.png, config/bootloaders/*/splash.png, config/includes.chroot/boot/grub/splash.png`: (c) 2020 Juliette Taka, CC-BY-SA-4.0 or GNU GPL-2.0 - The ISO image resulting from the build includes software packages under various licenses. See `README/COPYING/AUTHORS/LICENSE/COPYRIGHT` files in `/usr/share/doc/` on the installed system for licenses of each software package. diff --git a/Makefile b/Makefile index 214a4d4..878c85b 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,8 @@ list: #Shows this list @echo The following options are available @grep '^[^#[:space:]].*:' Makefile | grep -v := | sed -e "s/:[^|]*#/: /g" +prep_buildenv: #Preperation for build (setting file permissons, etc) + chmod 600 config/includes.chroot/etc/NetworkManager/system-connections/*.nmconnection install_buildenv: # Install packages required to build the image sudo apt -y install live-build make build-essential wget git unzip colordiff apt-transport-https rename ovmf rsync python3-venv gnupg apt-utils cpio @@ -13,7 +15,7 @@ download_extra: #For downloading extra's for iso (not needed/tested) make -f Makefile.extra #Add 'download_extra' to build without third party software/dotfiles (not needed/tested) -build: install_buildenv build_amd64 build_i386 clean_env #Runs build for all architectures +build: prep_buildenv install_buildenv build_amd64 build_i386 clean_env #Runs build for all architectures build_amd64: #Build iso for amd64 rm -f Custom-image-amd64.iso diff --git a/config/bootloaders/grub-pc/grub.cfg b/config/bootloaders/grub-pc/grub.cfg index 5668f6d..bdd468c 100644 --- a/config/bootloaders/grub-pc/grub.cfg +++ b/config/bootloaders/grub-pc/grub.cfg @@ -1,4 +1,5 @@ set default=0 +set timeout=5 loadfont $prefix/dejavu-bold-16.pf2 loadfont $prefix/dejavu-bold-14.pf2 @@ -29,11 +30,13 @@ play 960 440 1 0 4 440 1 menuentry "Live system " { + echo "Loading ${1}... Please wait...". linux KERNEL_LIVE APPEND_LIVE locales=en_US.UTF-8 initrd INITRD_LIVE } menuentry "Live system (ToRam)" { + echo "Loading ${1}... Please wait...". linux KERNEL_LIVE APPEND_LIVE toram locales=en_US.UTF-8 initrd INITRD_LIVE } diff --git a/config/bootloaders/grub-pc/splash.png b/config/bootloaders/grub-pc/splash.png index bdd56df..0f85e12 100644 Binary files a/config/bootloaders/grub-pc/splash.png and b/config/bootloaders/grub-pc/splash.png differ diff --git a/config/bootloaders/isolinux/isolinux.cfg b/config/bootloaders/isolinux/isolinux.cfg index a3e3eab..b6a150b 100644 --- a/config/bootloaders/isolinux/isolinux.cfg +++ b/config/bootloaders/isolinux/isolinux.cfg @@ -1,4 +1,3 @@ include menu.cfg default vesamenu.c32 -prompt 0 -timeout 0 +prompt 0 \ No newline at end of file diff --git a/config/bootloaders/isolinux/live.cfg.in b/config/bootloaders/isolinux/live.cfg.in deleted file mode 100644 index 1185c56..0000000 --- a/config/bootloaders/isolinux/live.cfg.in +++ /dev/null @@ -1,42 +0,0 @@ -menu hshift 0 -menu width 82 - -menu title dlc 3.0.0 - Boot menu -include stdmenu.cfg - -label live-@FLAVOUR@ - menu label ^Live (@FLAVOUR@) (English) - menu default - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE@ locales=en_US.UTF-8 - -menu begin advanced - menu title Advanced options - include stdmenu.cfg - - label live-@FLAVOUR@-failsafe - menu label ^Live (@FLAVOUR@ failsafe) - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE_FAILSAFE@ - - label install - menu label ^Install (text mode) - linux /install/vmlinuz - initrd /install/initrd.gz - append vga=788 @APPEND_INSTALL@ --- quiet - - label hdt - menu label ^Hardware Detection Tool (HDT) - com32 hdt.c32 - - label memtest - menu label ^Memory Diagnostic Tool (memtest86+) - linux /live/memtest - - label mainmenu - menu label ^Back.. - menu exit - -menu end diff --git a/config/bootloaders/isolinux/menu.cfg b/config/bootloaders/isolinux/menu.cfg index a71f932..a501d09 100644 --- a/config/bootloaders/isolinux/menu.cfg +++ b/config/bootloaders/isolinux/menu.cfg @@ -1,17 +1,18 @@ +timeout 100 menu hshift 0 menu width 82 menu title Gui-minimal-testing include stdmenu.cfg -label live-amd64 +label live menu label ^Live system menu default linux /live/vmlinuz initrd /live/initrd.img append boot=live config locales=en_US.UTF-8 -label live-amd64-r +label live-ram menu label ^Live system (ToRam) linux /live/vmlinuz initrd /live/initrd.img @@ -21,16 +22,12 @@ menu begin advanced menu title Advanced options include stdmenu.cfg - label live-amd64-failsafe + label live-failsafe menu label ^Live (amd64 failsafe) linux /live/vmlinuz initrd /live/initrd.img append boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=788 - label memtest - menu label ^Memory Diagnostic Tool (memtest86+) - linux /live/memtest - label mainmenu menu label ^Back.. menu exit diff --git a/config/bootloaders/isolinux/splash.png b/config/bootloaders/isolinux/splash.png index bdd56df..0f85e12 100644 Binary files a/config/bootloaders/isolinux/splash.png and b/config/bootloaders/isolinux/splash.png differ diff --git a/config/hooks/normal/0091-UpdateNetworkManagerPerms.chroot b/config/hooks/normal/0091-UpdateNetworkManagerPerms.chroot new file mode 100644 index 0000000..b38548e --- /dev/null +++ b/config/hooks/normal/0091-UpdateNetworkManagerPerms.chroot @@ -0,0 +1,3 @@ +#!/bin/bash +#Set perrmissons for saved networks in NetworkManager +chmod 600 /etc/NetworkManager/system-connections/*.nmconnection \ No newline at end of file diff --git a/config/hooks/normal/0091-remove-unwanted-icons.hook.chroot b/config/hooks/normal/0091-remove-unwanted-icons.hook.chroot new file mode 100644 index 0000000..359dcd8 --- /dev/null +++ b/config/hooks/normal/0091-remove-unwanted-icons.hook.chroot @@ -0,0 +1,9 @@ +#!/bin/bash +#Hide mail button in application menu +sed -i -e 's/OnlyShowIn/NotShowIn/g' /usr/share/applications/xfce4-mail-reader.desktop + +#Hide 'Thunar bulk rename' button in application menu +echo "NotShowIn=XFCE;" >> /usr/share/applications/thunar-bulk-rename.desktop + +#Hide 'Thunar bulk rename' button in application menu +echo "NotShowIn=XFCE;" >> /usr/share/applications/display-im6.q16.desktop \ No newline at end of file diff --git a/config/hooks/normal/0350-update-default-services-status.hook.chroot b/config/hooks/normal/0350-update-default-services-status.hook.chroot deleted file mode 100755 index 04c2a24..0000000 --- a/config/hooks/normal/0350-update-default-services-status.hook.chroot +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -echo "I: running $0" - -disabled_services="avahi-daemon.service openvpn.service rsync.service ssh.service nmbd.service smbd.service libvirtd.service libvirt-guests.service" -enabled_services="bluetooth.service fancontrol.service laptop-mode.service ntp.service preload.service smartmontools.service rsyslog.service lm-sensors.service hddtemp.service haveged.service" - -for service in $disabled_services; do - echo "Disabling $service" - systemctl disable "$service" || true - systemctl stop "$service" || true -done - -for service in $enabled_services; do - echo "Enabling $service" - systemctl enable "$service".service || true - systemctl start "$service".service || true -done \ No newline at end of file diff --git a/config/hooks/normal/0350-update-default-services-status.hook.chroot.disabled b/config/hooks/normal/0350-update-default-services-status.hook.chroot.disabled new file mode 100755 index 0000000..dffe14d --- /dev/null +++ b/config/hooks/normal/0350-update-default-services-status.hook.chroot.disabled @@ -0,0 +1,17 @@ +#!/bin/bash +echo "I: running $0" + +#disabled_services="" +#enabled_services="" + +#for service in $disabled_services; do +# echo "Disabling $service" +# systemctl disable "$service" || true +# systemctl stop "$service" || true +#done + +#for service in $enabled_services; do +# echo "Enabling $service" +# systemctl enable "$service".service || true +# systemctl start "$service".service || true +done \ No newline at end of file diff --git a/config/includes.chroot/boot/grub/splash.png b/config/includes.chroot/boot/grub/splash.png deleted file mode 100644 index c13d1c4..0000000 Binary files a/config/includes.chroot/boot/grub/splash.png and /dev/null differ diff --git a/config/includes.chroot/etc/NetworkManager/system-connections/Template.nmconnection b/config/includes.chroot/etc/NetworkManager/system-connections/Template.nmconnection new file mode 100644 index 0000000..989c05a --- /dev/null +++ b/config/includes.chroot/etc/NetworkManager/system-connections/Template.nmconnection @@ -0,0 +1,26 @@ +[connection] +id=TestAP +uuid=8049632e-b8ae-4fea-b397-c35f410754d1 +type=wifi +permissions=user:user:; + +[wifi] +mac-address-blacklist= +mode=infrastructure +ssid=TestAO + +[wifi-security] +auth-alg=open +key-mgmt=wpa-psk +psk=MyNicePassword123 + +[ipv4] +dns-search= +method=auto + +[ipv6] +addr-gen-mode=stable-privacy +dns-search= +method=auto + +[proxy] diff --git a/config/includes.chroot/etc/lightdm/lightdm-gtk-greeter.conf b/config/includes.chroot/etc/lightdm/lightdm-gtk-greeter.conf index 72d4e43..e3f2258 100644 --- a/config/includes.chroot/etc/lightdm/lightdm-gtk-greeter.conf +++ b/config/includes.chroot/etc/lightdm/lightdm-gtk-greeter.conf @@ -45,7 +45,7 @@ # transition-duration = overrides default value # [greeter] -background = /usr/share/backgrounds/homeworld-darker-3840x2160.png +background = /opt/custom/CustomBG.png user-background = false theme-name = Adwaita-dark icon-theme-name = Adwaita diff --git a/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index aab9289..db527d5 100644 --- a/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -4,19 +4,19 @@ - + - + - + - + diff --git a/config/includes.chroot/opt/custom/CustomBG.png b/config/includes.chroot/opt/custom/CustomBG.png new file mode 100644 index 0000000..60c3125 Binary files /dev/null and b/config/includes.chroot/opt/custom/CustomBG.png differ diff --git a/config/includes.chroot/usr/share/backgrounds/futureprototype-darker-4096x2160.svg b/config/includes.chroot/usr/share/backgrounds/futureprototype-darker-4096x2160.svg deleted file mode 100644 index cf62b0b..0000000 --- a/config/includes.chroot/usr/share/backgrounds/futureprototype-darker-4096x2160.svg +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/includes.chroot/usr/share/backgrounds/homeworld-darker-3840x2160.png b/config/includes.chroot/usr/share/backgrounds/homeworld-darker-3840x2160.png deleted file mode 100644 index 0ba559c..0000000 Binary files a/config/includes.chroot/usr/share/backgrounds/homeworld-darker-3840x2160.png and /dev/null differ diff --git a/config/package-lists/system.list.chroot b/config/package-lists/system.list.chroot index 0050004..9a8b77c 100644 --- a/config/package-lists/system.list.chroot +++ b/config/package-lists/system.list.chroot @@ -74,6 +74,7 @@ apparmor-profiles apparmor-utils libpam-tmpdir sudo +dbus-x11 #Section: Time chrony