diff --git a/config/cli/README.md b/config/cli/README.md new file mode 100644 index 000000000..a4994f0fc --- /dev/null +++ b/config/cli/README.md @@ -0,0 +1,4 @@ +|file|description| +|:--|:--| +|$RELEASE/main/packages |minimal| +|$RELEASE/main/packages.additional |server| diff --git a/config/cli/bookworm/debootstrap/components b/config/cli/bookworm/debootstrap/components index 7b63520a0..c28ba911a 120000 --- a/config/cli/bookworm/debootstrap/components +++ b/config/cli/bookworm/debootstrap/components @@ -1 +1 @@ -../../bullseye/debootstrap/components \ No newline at end of file +../../common/debootstrap/components.debian \ No newline at end of file diff --git a/config/cli/bookworm/debootstrap/config_desktop b/config/cli/bookworm/debootstrap/config_desktop index 119211b30..ed152e609 120000 --- a/config/cli/bookworm/debootstrap/config_desktop +++ b/config/cli/bookworm/debootstrap/config_desktop @@ -1 +1 @@ -../../bullseye/debootstrap/config_desktop \ No newline at end of file +../../common/debootstrap/config_desktop \ No newline at end of file diff --git a/config/cli/bookworm/debootstrap/packages b/config/cli/bookworm/debootstrap/packages deleted file mode 100644 index a14321270..000000000 --- a/config/cli/bookworm/debootstrap/packages +++ /dev/null @@ -1,36 +0,0 @@ -apt-utils -btrfs-progs -bzip2 -ca-certificates -console-setup -cpio -cron -dbus -dbus-user-session -debsums -dmsetup -fdisk -gnupg -haveged -ifupdown -init -initramfs-tools -iputils-ping -isc-dhcp-client -kmod -less -libpam-systemd -linux-base -locales -logrotate -netbase -netcat-openbsd -rsync -rsyslog -sudo -systemd -tzdata -ucf -udev -whiptail -wireless-regdb diff --git a/config/cli/bookworm/debootstrap/packages b/config/cli/bookworm/debootstrap/packages new file mode 120000 index 000000000..34350cd53 --- /dev/null +++ b/config/cli/bookworm/debootstrap/packages @@ -0,0 +1 @@ +../../common/debootstrap/packages \ No newline at end of file diff --git a/config/cli/bookworm/main b/config/cli/bookworm/main new file mode 120000 index 000000000..bf1efea22 --- /dev/null +++ b/config/cli/bookworm/main @@ -0,0 +1 @@ +../common/main \ No newline at end of file diff --git a/config/cli/bookworm/main/config_cli_standard/packages b/config/cli/bookworm/main/config_cli_standard/packages deleted file mode 100644 index e33544b1e..000000000 --- a/config/cli/bookworm/main/config_cli_standard/packages +++ /dev/null @@ -1,35 +0,0 @@ -apt-file -automake -bison -bridge-utils -build-essential -ca-certificates -command-not-found -console-setup -expect -fbset -flex -gnupg2 -hping3 -html2text -initramfs-tools -iptables -iw -keyboard-configuration -libnl-3-dev -libnl-genl-3-dev -libssl-dev -libwrap0-dev -linux-base -man-db -nfs-common -python3-distutils -python3-lib2to3 -rng-tools -selinux-policy-default -sudo -unattended-upgrades -unicode-data -vnstat -wireless-regdb -wpasupplicant diff --git a/config/cli/bookworm/main/config_cli_standard/packages.additional b/config/cli/bookworm/main/config_cli_standard/packages.additional deleted file mode 100644 index 671abb47d..000000000 --- a/config/cli/bookworm/main/config_cli_standard/packages.additional +++ /dev/null @@ -1,39 +0,0 @@ -alsa-utils -aptitude -avahi-autoipd -bash-completion -dosfstools -dkms -ethtool -evtest -f2fs-tools -f3 -git -haveged -hdparm -i2c-tools -ifenslave -iotop -iperf3 -iputils-arping -libdigest-sha-perl -libfuse2 -libnss-myhostname -libpam-systemd -libproc-processtable-perl -netplan.io -nfs-common -ntfs-3g -pciutils -plymouth -plymouth-themes -pv -qrencode -rfkill -screen -software-properties-common -stress -sunxi-tools -unzip -vim -vlan diff --git a/config/cli/bookworm/main/config_desktop/packages b/config/cli/bookworm/main/config_desktop/packages deleted file mode 100644 index 2a0471bb3..000000000 --- a/config/cli/bookworm/main/config_desktop/packages +++ /dev/null @@ -1,25 +0,0 @@ -automake -bison -bridge-utils -build-essential -ca-certificates -console-setup -expect -fbset -flex -fonts-ubuntu -html2text -initramfs-tools -iptables -iw -keyboard-configuration -libnl-3-dev -libnl-genl-3-dev -libssl-dev -libwrap0-dev -linux-base -sudo -unattended-upgrades -unicode-data -wireless-regdb -wpasupplicant diff --git a/config/cli/bookworm/main/config_desktop/packages.additional b/config/cli/bookworm/main/config_desktop/packages.additional deleted file mode 100644 index 14551cdb7..000000000 --- a/config/cli/bookworm/main/config_desktop/packages.additional +++ /dev/null @@ -1,33 +0,0 @@ -alsa-utils -aptitude -avahi-autoipd -bash-completion -dosfstools -ethtool -evtest -f2fs-tools -f3 -git -haveged -hdparm -ifenslave -iotop -iperf3 -iputils-arping -libdigest-sha-perl -libfuse2 -libnss-myhostname -libpam-systemd -libproc-processtable-perl -ntfs-3g -pciutils -pv -qrencode -rfkill -screen -software-properties-common -stress -sunxi-tools -unzip -vim -vlan diff --git a/config/cli/bookworm/main/packages b/config/cli/bookworm/main/packages deleted file mode 120000 index 174ae2db0..000000000 --- a/config/cli/bookworm/main/packages +++ /dev/null @@ -1 +0,0 @@ -../../bullseye/main/packages \ No newline at end of file diff --git a/config/cli/bookworm/main/packages.additional b/config/cli/bookworm/main/packages.additional deleted file mode 120000 index 7d54165b0..000000000 --- a/config/cli/bookworm/main/packages.additional +++ /dev/null @@ -1 +0,0 @@ -../../bullseye/main/packages.additional \ No newline at end of file diff --git a/config/cli/bookworm/main/packages.uninstall b/config/cli/bookworm/main/packages.uninstall deleted file mode 120000 index c8d5996ba..000000000 --- a/config/cli/bookworm/main/packages.uninstall +++ /dev/null @@ -1 +0,0 @@ -../../bullseye/main/packages.uninstall \ No newline at end of file diff --git a/config/cli/bullseye b/config/cli/bullseye new file mode 120000 index 000000000..5b206cd04 --- /dev/null +++ b/config/cli/bullseye @@ -0,0 +1 @@ +bookworm \ No newline at end of file diff --git a/config/cli/bullseye/debootstrap/packages b/config/cli/bullseye/debootstrap/packages deleted file mode 100644 index 69d7d9094..000000000 --- a/config/cli/bullseye/debootstrap/packages +++ /dev/null @@ -1,37 +0,0 @@ -apt-utils -btrfs-progs -bzip2 -ca-certificates -console-setup -cpio -crda -cron -dbus -dbus-user-session -debsums -dmsetup -fdisk -gnupg -haveged -ifupdown -init -initramfs-tools -iputils-ping -isc-dhcp-client -kmod -less -libpam-systemd -linux-base -locales -logrotate -netbase -netcat-openbsd -rsync -rsyslog -sudo -systemd -tzdata -ucf -udev -whiptail -wireless-regdb diff --git a/config/cli/bullseye/main/config_cli_standard/packages b/config/cli/bullseye/main/config_cli_standard/packages deleted file mode 100644 index 0948feff0..000000000 --- a/config/cli/bullseye/main/config_cli_standard/packages +++ /dev/null @@ -1,37 +0,0 @@ -apt-file -automake -bison -bridge-utils -build-essential -ca-certificates -command-not-found -console-setup -crda -dkms -expect -fbset -flex -gnupg2 -hping3 -html2text -initramfs-tools -iptables -iw -keyboard-configuration -libnl-3-dev -libnl-genl-3-dev -libssl-dev -libwrap0-dev -linux-base -man-db -netplan.io -networkd-dispatcher -nfs-common -python3-distutils -python3-lib2to3 -sudo -unattended-upgrades -unicode-data -vnstat -wireless-regdb -wpasupplicant diff --git a/config/cli/bullseye/main/config_cli_standard/packages.additional b/config/cli/bullseye/main/config_cli_standard/packages.additional deleted file mode 100644 index 67dbcc76f..000000000 --- a/config/cli/bullseye/main/config_cli_standard/packages.additional +++ /dev/null @@ -1,38 +0,0 @@ -alsa-utils -aptitude -avahi-autoipd -bash-completion -dnsutils -dosfstools -ethtool -evtest -f2fs-tools -f3 -git -haveged -hdparm -i2c-tools -ifenslave -iotop -iperf3 -iputils-arping -libdigest-sha-perl -libfuse2 -libnss-myhostname -libpam-systemd -libproc-processtable-perl -nfs-common -ntfs-3g -pciutils -plymouth -plymouth-themes -pv -qrencode -rfkill -screen -software-properties-common -stress -sunxi-tools -unzip -vim -vlan diff --git a/config/cli/bullseye/main/config_desktop/packages b/config/cli/bullseye/main/config_desktop/packages deleted file mode 100644 index 58a517335..000000000 --- a/config/cli/bullseye/main/config_desktop/packages +++ /dev/null @@ -1,27 +0,0 @@ -automake -bison -bridge-utils -build-essential -ca-certificates -console-setup -crda -fonts-ubuntu -expect -fbset -flex -html2text -initramfs-tools -iptables -iw -keyboard-configuration -libnl-3-dev -libnl-genl-3-dev -libssl-dev -libwrap0-dev -linux-base -nala -sudo -unattended-upgrades -unicode-data -wireless-regdb -wpasupplicant diff --git a/config/cli/bullseye/main/config_desktop/packages.additional b/config/cli/bullseye/main/config_desktop/packages.additional deleted file mode 100644 index c38152120..000000000 --- a/config/cli/bullseye/main/config_desktop/packages.additional +++ /dev/null @@ -1,34 +0,0 @@ -alsa-utils -aptitude -avahi-autoipd -bash-completion -dnsutils -dosfstools -ethtool -evtest -f2fs-tools -f3 -git -haveged -hdparm -ifenslave -iotop -iperf3 -iputils-arping -libdigest-sha-perl -libfuse2 -libnss-myhostname -libpam-systemd -libproc-processtable-perl -ntfs-3g -pciutils -pv -qrencode -rfkill -screen -software-properties-common -stress -sunxi-tools -unzip -vim -vlan diff --git a/config/cli/bullseye/main/config_desktop/sources/apt/nala.gpg b/config/cli/bullseye/main/config_desktop/sources/apt/nala.gpg deleted file mode 100644 index 79361eed9..000000000 Binary files a/config/cli/bullseye/main/config_desktop/sources/apt/nala.gpg and /dev/null differ diff --git a/config/cli/bullseye/main/config_desktop/sources/apt/nala.source b/config/cli/bullseye/main/config_desktop/sources/apt/nala.source deleted file mode 100644 index a87b69d8b..000000000 --- a/config/cli/bullseye/main/config_desktop/sources/apt/nala.source +++ /dev/null @@ -1 +0,0 @@ -deb [signed-by=/usr/share/keyrings/nala.gpg] http://deb.volian.org/volian/ scar main diff --git a/config/cli/bullseye/main/packages b/config/cli/bullseye/main/packages deleted file mode 100644 index 1341e01d0..000000000 --- a/config/cli/bullseye/main/packages +++ /dev/null @@ -1,18 +0,0 @@ -bc -cracklib-runtime -chrony -debconf-utils -device-tree-compiler -dialog -fake-hwclock -figlet -fping -ncurses-term -openssh-server -parted -psmisc -smartmontools -sysfsutils -toilet -u-boot-tools -usbutils diff --git a/config/cli/bullseye/main/packages.additional b/config/cli/bullseye/main/packages.additional deleted file mode 100644 index ba5194984..000000000 --- a/config/cli/bullseye/main/packages.additional +++ /dev/null @@ -1,17 +0,0 @@ -curl -htop -i2c-tools -jq -libcrack2 -lsof -mc -mmc-utils -nano -net-tools -network-manager -network-manager-openvpn -resolvconf -sysstat -wget -wireless-tools -wpasupplicant diff --git a/config/cli/buster b/config/cli/buster new file mode 120000 index 000000000..5b206cd04 --- /dev/null +++ b/config/cli/buster @@ -0,0 +1 @@ +bookworm \ No newline at end of file diff --git a/config/cli/buster/debootstrap/components b/config/cli/buster/debootstrap/components deleted file mode 100644 index ba2906d06..000000000 --- a/config/cli/buster/debootstrap/components +++ /dev/null @@ -1 +0,0 @@ -main diff --git a/config/cli/buster/debootstrap/config_desktop/packages b/config/cli/buster/debootstrap/config_desktop/packages deleted file mode 100644 index 404726787..000000000 --- a/config/cli/buster/debootstrap/config_desktop/packages +++ /dev/null @@ -1 +0,0 @@ -libgtk2.0-bin diff --git a/config/cli/buster/debootstrap/packages b/config/cli/buster/debootstrap/packages deleted file mode 100644 index a14321270..000000000 --- a/config/cli/buster/debootstrap/packages +++ /dev/null @@ -1,36 +0,0 @@ -apt-utils -btrfs-progs -bzip2 -ca-certificates -console-setup -cpio -cron -dbus -dbus-user-session -debsums -dmsetup -fdisk -gnupg -haveged -ifupdown -init -initramfs-tools -iputils-ping -isc-dhcp-client -kmod -less -libpam-systemd -linux-base -locales -logrotate -netbase -netcat-openbsd -rsync -rsyslog -sudo -systemd -tzdata -ucf -udev -whiptail -wireless-regdb diff --git a/config/cli/buster/main/config_cli_standard/packages b/config/cli/buster/main/config_cli_standard/packages deleted file mode 100644 index eb7e0a3fd..000000000 --- a/config/cli/buster/main/config_cli_standard/packages +++ /dev/null @@ -1,37 +0,0 @@ -apt-file -automake -bison -bridge-utils -build-essential -ca-certificates -command-not-found -console-setup -dkms -expect -fbset -flex -gnupg2 -hping3 -html2text -initramfs-tools -iptables -iw -keyboard-configuration -libnl-3-dev -libnl-genl-3-dev -libssl-dev -libwrap0-dev -linux-base -man-db -networkd-dispatcher -nfs-common -python3-distutils -python3-lib2to3 -rng-tools -selinux-policy-default -sudo -unattended-upgrades -unicode-data -vnstat -wireless-regdb -wpasupplicant diff --git a/config/cli/buster/main/config_cli_standard/packages.additional b/config/cli/buster/main/config_cli_standard/packages.additional deleted file mode 100644 index 67dbcc76f..000000000 --- a/config/cli/buster/main/config_cli_standard/packages.additional +++ /dev/null @@ -1,38 +0,0 @@ -alsa-utils -aptitude -avahi-autoipd -bash-completion -dnsutils -dosfstools -ethtool -evtest -f2fs-tools -f3 -git -haveged -hdparm -i2c-tools -ifenslave -iotop -iperf3 -iputils-arping -libdigest-sha-perl -libfuse2 -libnss-myhostname -libpam-systemd -libproc-processtable-perl -nfs-common -ntfs-3g -pciutils -plymouth -plymouth-themes -pv -qrencode -rfkill -screen -software-properties-common -stress -sunxi-tools -unzip -vim -vlan diff --git a/config/cli/buster/main/config_desktop/packages b/config/cli/buster/main/config_desktop/packages deleted file mode 100644 index 4b265b3b4..000000000 --- a/config/cli/buster/main/config_desktop/packages +++ /dev/null @@ -1,25 +0,0 @@ -automake -bison -bridge-utils -build-essential -ca-certificates -console-setup -expect -fonts-ubuntu -fbset -flex -html2text -initramfs-tools -iptables -iw -keyboard-configuration -libnl-3-dev -libnl-genl-3-dev -libssl-dev -libwrap0-dev -linux-base -sudo -unattended-upgrades -unicode-data -wireless-regdb -wpasupplicant diff --git a/config/cli/buster/main/config_desktop/packages.additional b/config/cli/buster/main/config_desktop/packages.additional deleted file mode 100644 index c38152120..000000000 --- a/config/cli/buster/main/config_desktop/packages.additional +++ /dev/null @@ -1,34 +0,0 @@ -alsa-utils -aptitude -avahi-autoipd -bash-completion -dnsutils -dosfstools -ethtool -evtest -f2fs-tools -f3 -git -haveged -hdparm -ifenslave -iotop -iperf3 -iputils-arping -libdigest-sha-perl -libfuse2 -libnss-myhostname -libpam-systemd -libproc-processtable-perl -ntfs-3g -pciutils -pv -qrencode -rfkill -screen -software-properties-common -stress -sunxi-tools -unzip -vim -vlan diff --git a/config/cli/buster/main/packages b/config/cli/buster/main/packages deleted file mode 100644 index 37d9f6104..000000000 --- a/config/cli/buster/main/packages +++ /dev/null @@ -1,19 +0,0 @@ -bc -chrony -cracklib-runtime -debconf-utils -device-tree-compiler -dialog -fake-hwclock -figlet -fping -ncurses-term -openssh-server -parted -psmisc -python3-apt -smartmontools -sysfsutils -toilet -u-boot-tools -usbutils diff --git a/config/cli/buster/main/packages.additional b/config/cli/buster/main/packages.additional deleted file mode 100644 index bf8c1c27e..000000000 --- a/config/cli/buster/main/packages.additional +++ /dev/null @@ -1,17 +0,0 @@ -curl -htop -i2c-tools -jq -libcrack2 -lsof -mc -mmc-utils -nano -netplan.io -net-tools -network-manager -network-manager-openvpn -resolvconf -sysstat -wget -wireless-tools diff --git a/config/cli/buster/main/packages.uninstall b/config/cli/buster/main/packages.uninstall deleted file mode 100644 index 7390f51f6..000000000 --- a/config/cli/buster/main/packages.uninstall +++ /dev/null @@ -1 +0,0 @@ -debsums diff --git a/config/cli/bullseye/debootstrap/components b/config/cli/common/debootstrap/components.debian similarity index 100% rename from config/cli/bullseye/debootstrap/components rename to config/cli/common/debootstrap/components.debian diff --git a/config/cli/focal/debootstrap/components b/config/cli/common/debootstrap/components.ubuntu similarity index 100% rename from config/cli/focal/debootstrap/components rename to config/cli/common/debootstrap/components.ubuntu diff --git a/config/cli/bullseye/debootstrap/config_desktop/packages b/config/cli/common/debootstrap/config_desktop/packages similarity index 100% rename from config/cli/bullseye/debootstrap/config_desktop/packages rename to config/cli/common/debootstrap/config_desktop/packages diff --git a/config/cli/common/debootstrap/packages b/config/cli/common/debootstrap/packages new file mode 100644 index 000000000..c5d3806e5 --- /dev/null +++ b/config/cli/common/debootstrap/packages @@ -0,0 +1,3 @@ +locales +console-setup +gnupg2 diff --git a/config/cli/common/main/packages b/config/cli/common/main/packages new file mode 100644 index 000000000..a59bcdb2e --- /dev/null +++ b/config/cli/common/main/packages @@ -0,0 +1,42 @@ +bc +bridge-utils +ca-certificates +chrony +command-not-found +console-setup +cron +curl +dbus-user-session +debconf-utils +debsums +device-tree-compiler +ethtool +fake-hwclock +fdisk +figlet +inetutils-ping +init +initramfs-tools +jq +logrotate +less +linux-base +man-db +mmc-utils +ncurses-term +nano +netplan.io +network-manager +openssh-server +parted +psmisc +rsync +rsyslog +sysfsutils +toilet +tzdata +u-boot-tools +usbutils +vlan +wireless-tools +wpasupplicant diff --git a/config/cli/common/main/packages.additional b/config/cli/common/main/packages.additional new file mode 100644 index 000000000..d1df09b23 --- /dev/null +++ b/config/cli/common/main/packages.additional @@ -0,0 +1,67 @@ +alsa-utils +apt-file +apt-utils +aptitude +automake +avahi-autoipd +bash-completion +bison +btrfs-progs +build-essential +cracklib-runtime +dkms +dosfstools +evtest +expect +f2fs-tools +f3 +fbset +flex +git +gpiod +gnupg2 +haveged +hdparm +htop +html2text +i2c-tools +ifenslave +iotop +iperf3 +iptables +keyboard-configuration +libdigest-sha-perl +libfuse2 +libnl-3-dev +libnl-genl-3-dev +libnss-myhostname +libpam-systemd +libproc-processtable-perl +libssl-dev +libwrap0-dev +lsof +mc +network-manager-openvpn +nfs-common +ntfs-3g +pciutils +plymouth +plymouth-themes +pv +python3-distutils +python3-lib2to3 +qrencode +rfkill +rng-tools +screen +selinux-policy-default +software-properties-common +smartmontools +stress +sudo +unattended-upgrades +unicode-data +unzip +vnstat +wget +wireless-regdb diff --git a/config/cli/bullseye/main/packages.uninstall b/config/cli/common/main/packages.uninstall similarity index 100% rename from config/cli/bullseye/main/packages.uninstall rename to config/cli/common/main/packages.uninstall diff --git a/config/cli/focal b/config/cli/focal new file mode 120000 index 000000000..2c1496890 --- /dev/null +++ b/config/cli/focal @@ -0,0 +1 @@ +lunar \ No newline at end of file diff --git a/config/cli/focal/debootstrap/config_desktop/packages b/config/cli/focal/debootstrap/config_desktop/packages deleted file mode 100644 index 20dfb5861..000000000 --- a/config/cli/focal/debootstrap/config_desktop/packages +++ /dev/null @@ -1,3 +0,0 @@ -dconf-cli -libglib2.0-dev -libgtk2.0-bin diff --git a/config/cli/focal/debootstrap/packages b/config/cli/focal/debootstrap/packages deleted file mode 100644 index 9d1ca26e5..000000000 --- a/config/cli/focal/debootstrap/packages +++ /dev/null @@ -1,36 +0,0 @@ -apt-utils -btrfs-progs -bzip2 -ca-certificates -console-setup -cpio -crda -cron -dbus -dbus-user-session -debsums -dmsetup -fdisk -gnupg -ifupdown -init -initramfs-tools -iputils-ping -isc-dhcp-client -kmod -less -libpam-systemd -linux-base -locales -logrotate -netbase -netcat-openbsd -rsync -rsyslog -sudo -systemd -tzdata -ucf -udev -whiptail -wireless-regdb diff --git a/config/cli/focal/main/config_cli_standard/packages b/config/cli/focal/main/config_cli_standard/packages deleted file mode 100644 index f32af0c22..000000000 --- a/config/cli/focal/main/config_cli_standard/packages +++ /dev/null @@ -1,35 +0,0 @@ -automake -bison -bridge-utils -build-essential -ca-certificates -console-setup -crda -dkms -expect -fbset -flex -gnupg2 -hping3 -html2text -initramfs-tools -iptables -iw -keyboard-configuration -libnl-3-dev -libnl-genl-3-dev -libssl-dev -libwrap0-dev -linux-base -man-db -networkd-dispatcher -nfs-common -python3-distutils -python3-lib2to3 -selinux-policy-default -sudo -unattended-upgrades -unicode-data -vnstat -wireless-regdb -wpasupplicant diff --git a/config/cli/focal/main/config_cli_standard/packages.additional b/config/cli/focal/main/config_cli_standard/packages.additional deleted file mode 100644 index 1858e5fa7..000000000 --- a/config/cli/focal/main/config_cli_standard/packages.additional +++ /dev/null @@ -1,37 +0,0 @@ -alsa-utils -aptitude -avahi-autoipd -bash-completion -dnsutils -dosfstools -ethtool -evtest -f2fs-tools -f3 -git -haveged -hdparm -ifenslave -iotop -iperf3 -iputils-arping -libdigest-sha-perl -libfuse2 -libnss-myhostname -libpam-systemd -libproc-processtable-perl -nfs-common -ntfs-3g -pciutils -plymouth -plymouth-themes -pv -qrencode -rfkill -screen -software-properties-common -stress -sunxi-tools -unzip -vim -vlan diff --git a/config/cli/focal/main/config_desktop/packages b/config/cli/focal/main/config_desktop/packages deleted file mode 100644 index 172a344d0..000000000 --- a/config/cli/focal/main/config_desktop/packages +++ /dev/null @@ -1,27 +0,0 @@ -automake -bison -bridge-utils -build-essential -ca-certificates -console-setup -crda -emacs-nox -expect -fbset -flex -fonts-ubuntu -html2text -initramfs-tools -iptables -iw -keyboard-configuration -libnl-3-dev -libnl-genl-3-dev -libssl-dev -libwrap0-dev -linux-base -sudo -unattended-upgrades -unicode-data -wireless-regdb -wpasupplicant diff --git a/config/cli/focal/main/config_desktop/packages.additional b/config/cli/focal/main/config_desktop/packages.additional deleted file mode 100644 index c38152120..000000000 --- a/config/cli/focal/main/config_desktop/packages.additional +++ /dev/null @@ -1,34 +0,0 @@ -alsa-utils -aptitude -avahi-autoipd -bash-completion -dnsutils -dosfstools -ethtool -evtest -f2fs-tools -f3 -git -haveged -hdparm -ifenslave -iotop -iperf3 -iputils-arping -libdigest-sha-perl -libfuse2 -libnss-myhostname -libpam-systemd -libproc-processtable-perl -ntfs-3g -pciutils -pv -qrencode -rfkill -screen -software-properties-common -stress -sunxi-tools -unzip -vim -vlan diff --git a/config/cli/focal/main/config_desktop/sources/apt/chromium-browser.gpg b/config/cli/focal/main/config_desktop/sources/apt/chromium-browser.gpg deleted file mode 100644 index 95cf6bbd3..000000000 Binary files a/config/cli/focal/main/config_desktop/sources/apt/chromium-browser.gpg and /dev/null differ diff --git a/config/cli/focal/main/config_desktop/sources/apt/chromium-browser.source b/config/cli/focal/main/config_desktop/sources/apt/chromium-browser.source deleted file mode 100644 index 6051d079c..000000000 --- a/config/cli/focal/main/config_desktop/sources/apt/chromium-browser.source +++ /dev/null @@ -1 +0,0 @@ -deb [signed-by=/usr/share/keyrings/chromium-browser.gpg] http://ppa.launchpadcontent.net/saiarcot895/chromium-beta/ubuntu/ focal main diff --git a/config/cli/focal/main/config_desktop/sources/apt/mozilla-team.gpg b/config/cli/focal/main/config_desktop/sources/apt/mozilla-team.gpg deleted file mode 100644 index 1384255d9..000000000 Binary files a/config/cli/focal/main/config_desktop/sources/apt/mozilla-team.gpg and /dev/null differ diff --git a/config/cli/focal/main/config_desktop/sources/apt/mozilla-team.source b/config/cli/focal/main/config_desktop/sources/apt/mozilla-team.source deleted file mode 100644 index 4cad4659f..000000000 --- a/config/cli/focal/main/config_desktop/sources/apt/mozilla-team.source +++ /dev/null @@ -1 +0,0 @@ -deb [signed-by=/usr/share/keyrings/mozilla-team.gpg] http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/ focal main diff --git a/config/cli/focal/main/packages b/config/cli/focal/main/packages deleted file mode 100644 index 37d9f6104..000000000 --- a/config/cli/focal/main/packages +++ /dev/null @@ -1,19 +0,0 @@ -bc -chrony -cracklib-runtime -debconf-utils -device-tree-compiler -dialog -fake-hwclock -figlet -fping -ncurses-term -openssh-server -parted -psmisc -python3-apt -smartmontools -sysfsutils -toilet -u-boot-tools -usbutils diff --git a/config/cli/focal/main/packages.additional b/config/cli/focal/main/packages.additional deleted file mode 100644 index facb10633..000000000 --- a/config/cli/focal/main/packages.additional +++ /dev/null @@ -1,17 +0,0 @@ -curl -htop -i2c-tools -jq -libcrack2 -lsof -mc -mmc-utils -nano -net-tools -netplan.io -network-manager -network-manager-openvpn -resolvconf -sysstat -wget -wireless-tools diff --git a/config/cli/focal/main/packages.uninstall b/config/cli/focal/main/packages.uninstall deleted file mode 100644 index 7390f51f6..000000000 --- a/config/cli/focal/main/packages.uninstall +++ /dev/null @@ -1 +0,0 @@ -debsums diff --git a/config/cli/jammy b/config/cli/jammy new file mode 120000 index 000000000..2c1496890 --- /dev/null +++ b/config/cli/jammy @@ -0,0 +1 @@ +lunar \ No newline at end of file diff --git a/config/cli/jammy/debootstrap/components b/config/cli/jammy/debootstrap/components deleted file mode 120000 index a9561b095..000000000 --- a/config/cli/jammy/debootstrap/components +++ /dev/null @@ -1 +0,0 @@ -../../focal/debootstrap/components \ No newline at end of file diff --git a/config/cli/jammy/debootstrap/config_desktop b/config/cli/jammy/debootstrap/config_desktop deleted file mode 120000 index 8f58607e0..000000000 --- a/config/cli/jammy/debootstrap/config_desktop +++ /dev/null @@ -1 +0,0 @@ -../../focal/debootstrap/config_desktop \ No newline at end of file diff --git a/config/cli/jammy/debootstrap/packages b/config/cli/jammy/debootstrap/packages deleted file mode 100644 index fab515257..000000000 --- a/config/cli/jammy/debootstrap/packages +++ /dev/null @@ -1,35 +0,0 @@ -apt-utils -btrfs-progs -bzip2 -ca-certificates -console-setup -cpio -cron -dbus -dbus-user-session -debsums -dmsetup -fdisk -gnupg -ifupdown -init -initramfs-tools -iputils-ping -isc-dhcp-client -kmod -less -libpam-systemd -linux-base -locales -logrotate -netbase -netcat-openbsd -rsync -rsyslog -sudo -systemd -tzdata -ucf -udev -whiptail -wireless-regdb diff --git a/config/cli/jammy/main/config_cli_standard/packages b/config/cli/jammy/main/config_cli_standard/packages deleted file mode 100644 index 215c7590e..000000000 --- a/config/cli/jammy/main/config_cli_standard/packages +++ /dev/null @@ -1,34 +0,0 @@ -automake -bison -bridge-utils -build-essential -ca-certificates -console-setup -dkms -expect -fbset -flex -gnupg2 -hping3 -html2text -initramfs-tools -iptables -iw -keyboard-configuration -libnl-3-dev -libnl-genl-3-dev -libssl-dev -libwrap0-dev -linux-base -man-db -networkd-dispatcher -nfs-common -python3-distutils -python3-lib2to3 -selinux-policy-default -sudo -unattended-upgrades -unicode-data -vnstat -wireless-regdb -wpasupplicant diff --git a/config/cli/jammy/main/config_cli_standard/packages.additional b/config/cli/jammy/main/config_cli_standard/packages.additional deleted file mode 120000 index f9f15ca53..000000000 --- a/config/cli/jammy/main/config_cli_standard/packages.additional +++ /dev/null @@ -1 +0,0 @@ -../../../focal/main/config_cli_standard/packages.additional \ No newline at end of file diff --git a/config/cli/jammy/main/config_desktop/packages b/config/cli/jammy/main/config_desktop/packages deleted file mode 100644 index 81b458c22..000000000 --- a/config/cli/jammy/main/config_desktop/packages +++ /dev/null @@ -1,27 +0,0 @@ -automake -bison -bridge-utils -build-essential -ca-certificates -console-setup -emacs-nox -expect -fbset -flex -fonts-ubuntu -html2text -initramfs-tools -iptables -iw -keyboard-configuration -libnl-3-dev -libnl-genl-3-dev -libssl-dev -libwrap0-dev -linux-base -nala -sudo -unattended-upgrades -unicode-data -wireless-regdb -wpasupplicant diff --git a/config/cli/jammy/main/config_desktop/packages.additional b/config/cli/jammy/main/config_desktop/packages.additional deleted file mode 120000 index 1de8fcb3c..000000000 --- a/config/cli/jammy/main/config_desktop/packages.additional +++ /dev/null @@ -1 +0,0 @@ -../../../focal/main/config_desktop/packages.additional \ No newline at end of file diff --git a/config/cli/jammy/main/config_desktop/sources/apt/chromium-browser.gpg b/config/cli/jammy/main/config_desktop/sources/apt/chromium-browser.gpg deleted file mode 100644 index 95cf6bbd3..000000000 Binary files a/config/cli/jammy/main/config_desktop/sources/apt/chromium-browser.gpg and /dev/null differ diff --git a/config/cli/jammy/main/config_desktop/sources/apt/chromium-browser.source b/config/cli/jammy/main/config_desktop/sources/apt/chromium-browser.source deleted file mode 100644 index 349ba37c6..000000000 --- a/config/cli/jammy/main/config_desktop/sources/apt/chromium-browser.source +++ /dev/null @@ -1 +0,0 @@ -deb [signed-by=/usr/share/keyrings/chromium-browser.gpg] http://ppa.launchpadcontent.net/saiarcot895/chromium-beta/ubuntu/ jammy main diff --git a/config/cli/jammy/main/config_desktop/sources/apt/mozilla-team.gpg b/config/cli/jammy/main/config_desktop/sources/apt/mozilla-team.gpg deleted file mode 100644 index 1384255d9..000000000 Binary files a/config/cli/jammy/main/config_desktop/sources/apt/mozilla-team.gpg and /dev/null differ diff --git a/config/cli/jammy/main/config_desktop/sources/apt/mozilla-team.source b/config/cli/jammy/main/config_desktop/sources/apt/mozilla-team.source deleted file mode 100644 index b8138a6f9..000000000 --- a/config/cli/jammy/main/config_desktop/sources/apt/mozilla-team.source +++ /dev/null @@ -1 +0,0 @@ -deb [signed-by=/usr/share/keyrings/mozilla-team.gpg] http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/ jammy main diff --git a/config/cli/jammy/main/config_desktop/sources/apt/nala.gpg b/config/cli/jammy/main/config_desktop/sources/apt/nala.gpg deleted file mode 100644 index 79361eed9..000000000 Binary files a/config/cli/jammy/main/config_desktop/sources/apt/nala.gpg and /dev/null differ diff --git a/config/cli/jammy/main/config_desktop/sources/apt/nala.source b/config/cli/jammy/main/config_desktop/sources/apt/nala.source deleted file mode 100644 index a87b69d8b..000000000 --- a/config/cli/jammy/main/config_desktop/sources/apt/nala.source +++ /dev/null @@ -1 +0,0 @@ -deb [signed-by=/usr/share/keyrings/nala.gpg] http://deb.volian.org/volian/ scar main diff --git a/config/cli/jammy/main/packages b/config/cli/jammy/main/packages deleted file mode 100644 index 37d9f6104..000000000 --- a/config/cli/jammy/main/packages +++ /dev/null @@ -1,19 +0,0 @@ -bc -chrony -cracklib-runtime -debconf-utils -device-tree-compiler -dialog -fake-hwclock -figlet -fping -ncurses-term -openssh-server -parted -psmisc -python3-apt -smartmontools -sysfsutils -toilet -u-boot-tools -usbutils diff --git a/config/cli/jammy/main/packages.additional b/config/cli/jammy/main/packages.additional deleted file mode 100644 index 098cff562..000000000 --- a/config/cli/jammy/main/packages.additional +++ /dev/null @@ -1,18 +0,0 @@ -curl -htop -i2c-tools -jq -libcrack2 -lsof -mc -mmc-utils -nano -net-tools -netplan.io -network-manager -network-manager-openvpn -resolvconf -sysstat -wget -wireless-tools -wpasupplicant diff --git a/config/cli/jammy/main/packages.uninstall b/config/cli/jammy/main/packages.uninstall deleted file mode 100644 index 7390f51f6..000000000 --- a/config/cli/jammy/main/packages.uninstall +++ /dev/null @@ -1 +0,0 @@ -debsums diff --git a/config/cli/kinetic b/config/cli/kinetic new file mode 120000 index 000000000..2c1496890 --- /dev/null +++ b/config/cli/kinetic @@ -0,0 +1 @@ +lunar \ No newline at end of file diff --git a/config/cli/kinetic/debootstrap b/config/cli/kinetic/debootstrap deleted file mode 120000 index 3a2f1c6eb..000000000 --- a/config/cli/kinetic/debootstrap +++ /dev/null @@ -1 +0,0 @@ -../jammy/debootstrap \ No newline at end of file diff --git a/config/cli/kinetic/main/config_cli_standard b/config/cli/kinetic/main/config_cli_standard deleted file mode 120000 index 03d9e1ecb..000000000 --- a/config/cli/kinetic/main/config_cli_standard +++ /dev/null @@ -1 +0,0 @@ -../../jammy/main/config_cli_standard \ No newline at end of file diff --git a/config/cli/kinetic/main/config_desktop b/config/cli/kinetic/main/config_desktop deleted file mode 120000 index 9f8254298..000000000 --- a/config/cli/kinetic/main/config_desktop +++ /dev/null @@ -1 +0,0 @@ -../../jammy/main/config_desktop \ No newline at end of file diff --git a/config/cli/kinetic/main/packages b/config/cli/kinetic/main/packages deleted file mode 100644 index c03d917d1..000000000 --- a/config/cli/kinetic/main/packages +++ /dev/null @@ -1,18 +0,0 @@ -bc -chrony -debconf-utils -device-tree-compiler -dialog -fake-hwclock -figlet -fping -ncurses-term -openssh-server -parted -psmisc -python3-apt -smartmontools -sysfsutils -toilet -u-boot-tools -usbutils diff --git a/config/cli/kinetic/main/packages.additional b/config/cli/kinetic/main/packages.additional deleted file mode 100644 index 1d7bf1d3b..000000000 --- a/config/cli/kinetic/main/packages.additional +++ /dev/null @@ -1,20 +0,0 @@ -cracklib-runtime -curl -htop -i2c-tools -jq -libcrack2 -lsof -mc -mmc-utils -nano -net-tools -netplan.io -network-manager -network-manager-openvpn -resolvconf -sysstat -systemd-resolved -wget -wireless-tools -wpasupplicant diff --git a/config/cli/kinetic/main/packages.uninstall b/config/cli/kinetic/main/packages.uninstall deleted file mode 100644 index 7390f51f6..000000000 --- a/config/cli/kinetic/main/packages.uninstall +++ /dev/null @@ -1 +0,0 @@ -debsums diff --git a/config/cli/lunar b/config/cli/lunar deleted file mode 120000 index c23bec673..000000000 --- a/config/cli/lunar +++ /dev/null @@ -1 +0,0 @@ -kinetic \ No newline at end of file diff --git a/config/cli/lunar/debootstrap/components b/config/cli/lunar/debootstrap/components new file mode 120000 index 000000000..8ccc6b698 --- /dev/null +++ b/config/cli/lunar/debootstrap/components @@ -0,0 +1 @@ +../../common/debootstrap/components.ubuntu \ No newline at end of file diff --git a/config/cli/lunar/debootstrap/config_desktop b/config/cli/lunar/debootstrap/config_desktop new file mode 120000 index 000000000..ed152e609 --- /dev/null +++ b/config/cli/lunar/debootstrap/config_desktop @@ -0,0 +1 @@ +../../common/debootstrap/config_desktop \ No newline at end of file diff --git a/config/cli/lunar/debootstrap/packages b/config/cli/lunar/debootstrap/packages new file mode 120000 index 000000000..34350cd53 --- /dev/null +++ b/config/cli/lunar/debootstrap/packages @@ -0,0 +1 @@ +../../common/debootstrap/packages \ No newline at end of file diff --git a/config/cli/lunar/main b/config/cli/lunar/main new file mode 120000 index 000000000..bf1efea22 --- /dev/null +++ b/config/cli/lunar/main @@ -0,0 +1 @@ +../common/main \ No newline at end of file diff --git a/config/cli/sid b/config/cli/sid new file mode 120000 index 000000000..5b206cd04 --- /dev/null +++ b/config/cli/sid @@ -0,0 +1 @@ +bookworm \ No newline at end of file diff --git a/config/cli/sid/debootstrap/components b/config/cli/sid/debootstrap/components deleted file mode 100644 index ba2906d06..000000000 --- a/config/cli/sid/debootstrap/components +++ /dev/null @@ -1 +0,0 @@ -main diff --git a/config/cli/sid/debootstrap/config_desktop/packages b/config/cli/sid/debootstrap/config_desktop/packages deleted file mode 100644 index 20dfb5861..000000000 --- a/config/cli/sid/debootstrap/config_desktop/packages +++ /dev/null @@ -1,3 +0,0 @@ -dconf-cli -libglib2.0-dev -libgtk2.0-bin diff --git a/config/cli/sid/debootstrap/packages b/config/cli/sid/debootstrap/packages deleted file mode 100644 index a14321270..000000000 --- a/config/cli/sid/debootstrap/packages +++ /dev/null @@ -1,36 +0,0 @@ -apt-utils -btrfs-progs -bzip2 -ca-certificates -console-setup -cpio -cron -dbus -dbus-user-session -debsums -dmsetup -fdisk -gnupg -haveged -ifupdown -init -initramfs-tools -iputils-ping -isc-dhcp-client -kmod -less -libpam-systemd -linux-base -locales -logrotate -netbase -netcat-openbsd -rsync -rsyslog -sudo -systemd -tzdata -ucf -udev -whiptail -wireless-regdb diff --git a/config/cli/sid/main/config_cli_standard/packages b/config/cli/sid/main/config_cli_standard/packages deleted file mode 100644 index eb7e0a3fd..000000000 --- a/config/cli/sid/main/config_cli_standard/packages +++ /dev/null @@ -1,37 +0,0 @@ -apt-file -automake -bison -bridge-utils -build-essential -ca-certificates -command-not-found -console-setup -dkms -expect -fbset -flex -gnupg2 -hping3 -html2text -initramfs-tools -iptables -iw -keyboard-configuration -libnl-3-dev -libnl-genl-3-dev -libssl-dev -libwrap0-dev -linux-base -man-db -networkd-dispatcher -nfs-common -python3-distutils -python3-lib2to3 -rng-tools -selinux-policy-default -sudo -unattended-upgrades -unicode-data -vnstat -wireless-regdb -wpasupplicant diff --git a/config/cli/sid/main/config_cli_standard/packages.additional b/config/cli/sid/main/config_cli_standard/packages.additional deleted file mode 100644 index dbb2e933a..000000000 --- a/config/cli/sid/main/config_cli_standard/packages.additional +++ /dev/null @@ -1,37 +0,0 @@ -alsa-utils -aptitude -avahi-autoipd -bash-completion -dosfstools -ethtool -evtest -f2fs-tools -f3 -git -haveged -hdparm -i2c-tools -ifenslave -iotop -iperf3 -iputils-arping -libdigest-sha-perl -libfuse2 -libnss-myhostname -libpam-systemd -libproc-processtable-perl -nfs-common -ntfs-3g -pciutils -plymouth -plymouth-themes -pv -qrencode -rfkill -screen -software-properties-common -stress -sunxi-tools -unzip -vim -vlan diff --git a/config/cli/sid/main/config_desktop/packages b/config/cli/sid/main/config_desktop/packages deleted file mode 100644 index 2a0471bb3..000000000 --- a/config/cli/sid/main/config_desktop/packages +++ /dev/null @@ -1,25 +0,0 @@ -automake -bison -bridge-utils -build-essential -ca-certificates -console-setup -expect -fbset -flex -fonts-ubuntu -html2text -initramfs-tools -iptables -iw -keyboard-configuration -libnl-3-dev -libnl-genl-3-dev -libssl-dev -libwrap0-dev -linux-base -sudo -unattended-upgrades -unicode-data -wireless-regdb -wpasupplicant diff --git a/config/cli/sid/main/config_desktop/packages.additional b/config/cli/sid/main/config_desktop/packages.additional deleted file mode 100644 index 14551cdb7..000000000 --- a/config/cli/sid/main/config_desktop/packages.additional +++ /dev/null @@ -1,33 +0,0 @@ -alsa-utils -aptitude -avahi-autoipd -bash-completion -dosfstools -ethtool -evtest -f2fs-tools -f3 -git -haveged -hdparm -ifenslave -iotop -iperf3 -iputils-arping -libdigest-sha-perl -libfuse2 -libnss-myhostname -libpam-systemd -libproc-processtable-perl -ntfs-3g -pciutils -pv -qrencode -rfkill -screen -software-properties-common -stress -sunxi-tools -unzip -vim -vlan diff --git a/config/cli/sid/main/packages b/config/cli/sid/main/packages deleted file mode 100644 index c70a57718..000000000 --- a/config/cli/sid/main/packages +++ /dev/null @@ -1,20 +0,0 @@ -bc -chrony -cracklib-runtime -debconf-utils -device-tree-compiler -dialog -fake-hwclock -figlet -fping -nala -ncurses-term -openssh-server -parted -psmisc -python3-apt -smartmontools -sysfsutils -toilet -u-boot-tools -usbutils diff --git a/config/cli/sid/main/packages.additional b/config/cli/sid/main/packages.additional deleted file mode 100644 index bf8c1c27e..000000000 --- a/config/cli/sid/main/packages.additional +++ /dev/null @@ -1,17 +0,0 @@ -curl -htop -i2c-tools -jq -libcrack2 -lsof -mc -mmc-utils -nano -netplan.io -net-tools -network-manager -network-manager-openvpn -resolvconf -sysstat -wget -wireless-tools diff --git a/config/cli/sid/main/packages.uninstall b/config/cli/sid/main/packages.uninstall deleted file mode 100644 index 7390f51f6..000000000 --- a/config/cli/sid/main/packages.uninstall +++ /dev/null @@ -1 +0,0 @@ -debsums diff --git a/config/desktop/bullseye/environments/budgie/config_base/packages b/config/desktop/bullseye/environments/budgie/config_base/packages index db96d16b7..73b4e385f 100644 --- a/config/desktop/bullseye/environments/budgie/config_base/packages +++ b/config/desktop/bullseye/environments/budgie/config_base/packages @@ -56,6 +56,7 @@ evince-common fontconfig fontconfig-config fonts-noto-mono +fonts-ubuntu fonts-ubuntu-font-family-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/bullseye/environments/cinnamon/config_base/packages b/config/desktop/bullseye/environments/cinnamon/config_base/packages index db0b04145..068172743 100644 --- a/config/desktop/bullseye/environments/cinnamon/config_base/packages +++ b/config/desktop/bullseye/environments/cinnamon/config_base/packages @@ -28,6 +28,7 @@ evince evince-common fontconfig fontconfig-config +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/bullseye/environments/gnome/config_base/packages b/config/desktop/bullseye/environments/gnome/config_base/packages index 17e510e5b..6c1266aa1 100644 --- a/config/desktop/bullseye/environments/gnome/config_base/packages +++ b/config/desktop/bullseye/environments/gnome/config_base/packages @@ -8,6 +8,7 @@ dmz-cursor-theme dconf-cli eject foomatic-db-compressed-ppds +fonts-ubuntu fonts-ubuntu-console gdebi gconf2 diff --git a/config/desktop/bullseye/environments/kde-plasma/config_base/packages b/config/desktop/bullseye/environments/kde-plasma/config_base/packages index 94268ed69..2aca21622 100644 --- a/config/desktop/bullseye/environments/kde-plasma/config_base/packages +++ b/config/desktop/bullseye/environments/kde-plasma/config_base/packages @@ -31,6 +31,7 @@ fonts-nanum fonts-opensymbol fonts-stix fonts-symbola +fonts-ubuntu fonts-ubuntu-font-family-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/bullseye/environments/mate/config_base/packages b/config/desktop/bullseye/environments/mate/config_base/packages index 5119228e1..dcd28b6e4 100644 --- a/config/desktop/bullseye/environments/mate/config_base/packages +++ b/config/desktop/bullseye/environments/mate/config_base/packages @@ -116,6 +116,7 @@ xdg-desktop-portal xdg-user-dirs xdg-user-dirs-gtk xfonts-base +fonts-ubuntu xinput xorg-docs-core xscreensaver diff --git a/config/desktop/bullseye/environments/xmonad/config_base/packages b/config/desktop/bullseye/environments/xmonad/config_base/packages index 936fad2c8..e2a7d6689 100644 --- a/config/desktop/bullseye/environments/xmonad/config_base/packages +++ b/config/desktop/bullseye/environments/xmonad/config_base/packages @@ -37,6 +37,7 @@ fonts-nanum fonts-opensymbol fonts-stix fonts-symbola +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds ghostscript-x diff --git a/config/desktop/buster/environments/cinnamon/config_base/packages b/config/desktop/buster/environments/cinnamon/config_base/packages index db0b04145..068172743 100644 --- a/config/desktop/buster/environments/cinnamon/config_base/packages +++ b/config/desktop/buster/environments/cinnamon/config_base/packages @@ -28,6 +28,7 @@ evince evince-common fontconfig fontconfig-config +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/buster/environments/gnome/config_base/packages b/config/desktop/buster/environments/gnome/config_base/packages index 17e510e5b..6c1266aa1 100644 --- a/config/desktop/buster/environments/gnome/config_base/packages +++ b/config/desktop/buster/environments/gnome/config_base/packages @@ -8,6 +8,7 @@ dmz-cursor-theme dconf-cli eject foomatic-db-compressed-ppds +fonts-ubuntu fonts-ubuntu-console gdebi gconf2 diff --git a/config/desktop/buster/environments/lxde/config_base/packages b/config/desktop/buster/environments/lxde/config_base/packages index cdac6f58a..2092162c0 100644 --- a/config/desktop/buster/environments/lxde/config_base/packages +++ b/config/desktop/buster/environments/lxde/config_base/packages @@ -109,6 +109,7 @@ xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable +fonts-ubuntu xorg-docs xorg-docs-core xscreensaver diff --git a/config/desktop/buster/environments/mate/config_base/packages b/config/desktop/buster/environments/mate/config_base/packages index 5119228e1..dcd28b6e4 100644 --- a/config/desktop/buster/environments/mate/config_base/packages +++ b/config/desktop/buster/environments/mate/config_base/packages @@ -116,6 +116,7 @@ xdg-desktop-portal xdg-user-dirs xdg-user-dirs-gtk xfonts-base +fonts-ubuntu xinput xorg-docs-core xscreensaver diff --git a/config/desktop/buster/environments/xfce/config_base/packages b/config/desktop/buster/environments/xfce/config_base/packages index 8f835ecc1..b3544ab90 100644 --- a/config/desktop/buster/environments/xfce/config_base/packages +++ b/config/desktop/buster/environments/xfce/config_base/packages @@ -18,6 +18,7 @@ evince evince-common fontconfig fontconfig-config +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/focal/environments/budgie/config_base/packages b/config/desktop/focal/environments/budgie/config_base/packages index b6e55a0fb..99e17a892 100644 --- a/config/desktop/focal/environments/budgie/config_base/packages +++ b/config/desktop/focal/environments/budgie/config_base/packages @@ -57,6 +57,7 @@ evince-common fontconfig fontconfig-config fonts-noto-mono +fonts-ubuntu fonts-ubuntu-font-family-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/focal/environments/cinnamon/config_base/packages b/config/desktop/focal/environments/cinnamon/config_base/packages index 99d1b0f59..8bc54750b 100644 --- a/config/desktop/focal/environments/cinnamon/config_base/packages +++ b/config/desktop/focal/environments/cinnamon/config_base/packages @@ -28,6 +28,7 @@ evince evince-common fontconfig fontconfig-config +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/focal/environments/deepin/config_base/packages b/config/desktop/focal/environments/deepin/config_base/packages index c9285df71..27df0214d 100644 --- a/config/desktop/focal/environments/deepin/config_base/packages +++ b/config/desktop/focal/environments/deepin/config_base/packages @@ -72,6 +72,7 @@ fonts-nanum fonts-opensymbol fonts-stix fonts-symbola +fonts-ubuntu fonts-ubuntu-font-family-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/focal/environments/enlightenment/config_base/packages b/config/desktop/focal/environments/enlightenment/config_base/packages index a58cbfc8c..211a95ff9 100644 --- a/config/desktop/focal/environments/enlightenment/config_base/packages +++ b/config/desktop/focal/environments/enlightenment/config_base/packages @@ -35,6 +35,7 @@ fonts-nanum fonts-opensymbol fonts-stix fonts-symbola +fonts-ubuntu fonts-ubuntu-font-family-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/focal/environments/gnome/config_base/packages b/config/desktop/focal/environments/gnome/config_base/packages index 17e510e5b..6c1266aa1 100644 --- a/config/desktop/focal/environments/gnome/config_base/packages +++ b/config/desktop/focal/environments/gnome/config_base/packages @@ -8,6 +8,7 @@ dmz-cursor-theme dconf-cli eject foomatic-db-compressed-ppds +fonts-ubuntu fonts-ubuntu-console gdebi gconf2 diff --git a/config/desktop/focal/environments/i3-wm/config_base/packages b/config/desktop/focal/environments/i3-wm/config_base/packages index c95f02104..31a351ca9 100644 --- a/config/desktop/focal/environments/i3-wm/config_base/packages +++ b/config/desktop/focal/environments/i3-wm/config_base/packages @@ -40,6 +40,7 @@ fonts-nanum fonts-opensymbol fonts-stix fonts-symbola +fonts-ubuntu fonts-ubuntu-font-family-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/focal/environments/kde-plasma/config_base/packages b/config/desktop/focal/environments/kde-plasma/config_base/packages index 828be375f..1c4a0ed52 100644 --- a/config/desktop/focal/environments/kde-plasma/config_base/packages +++ b/config/desktop/focal/environments/kde-plasma/config_base/packages @@ -33,6 +33,7 @@ fonts-nanum fonts-opensymbol fonts-stix fonts-symbola +fonts-ubuntu fonts-ubuntu-font-family-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/focal/environments/mate/config_base/packages b/config/desktop/focal/environments/mate/config_base/packages index 95a2422b6..42c8d6770 100644 --- a/config/desktop/focal/environments/mate/config_base/packages +++ b/config/desktop/focal/environments/mate/config_base/packages @@ -33,6 +33,7 @@ fonts-nanum fonts-opensymbol fonts-stix fonts-symbola +fonts-ubuntu fonts-ubuntu-font-family-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/focal/environments/xfce/config_base/packages b/config/desktop/focal/environments/xfce/config_base/packages index a41b9a9aa..1de159561 100644 --- a/config/desktop/focal/environments/xfce/config_base/packages +++ b/config/desktop/focal/environments/xfce/config_base/packages @@ -18,6 +18,7 @@ evince evince-common fontconfig fontconfig-config +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/focal/environments/xmonad/config_base/packages b/config/desktop/focal/environments/xmonad/config_base/packages index ad2b42f3c..15f630fb7 100644 --- a/config/desktop/focal/environments/xmonad/config_base/packages +++ b/config/desktop/focal/environments/xmonad/config_base/packages @@ -36,6 +36,7 @@ fonts-nanum fonts-opensymbol fonts-stix fonts-symbola +fonts-ubuntu fonts-ubuntu-font-family-console foomatic-db-compressed-ppds ghostscript-x diff --git a/config/desktop/jammy/environments/budgie/config_base/packages b/config/desktop/jammy/environments/budgie/config_base/packages index e0cbda1ea..e7b1865ff 100644 --- a/config/desktop/jammy/environments/budgie/config_base/packages +++ b/config/desktop/jammy/environments/budgie/config_base/packages @@ -55,6 +55,7 @@ evince-common fontconfig fontconfig-config fonts-noto-mono +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/jammy/environments/cinnamon/config_base/packages b/config/desktop/jammy/environments/cinnamon/config_base/packages index 99d1b0f59..8bc54750b 100644 --- a/config/desktop/jammy/environments/cinnamon/config_base/packages +++ b/config/desktop/jammy/environments/cinnamon/config_base/packages @@ -28,6 +28,7 @@ evince evince-common fontconfig fontconfig-config +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/jammy/environments/gnome/config_base/packages b/config/desktop/jammy/environments/gnome/config_base/packages index 17e510e5b..6c1266aa1 100644 --- a/config/desktop/jammy/environments/gnome/config_base/packages +++ b/config/desktop/jammy/environments/gnome/config_base/packages @@ -8,6 +8,7 @@ dmz-cursor-theme dconf-cli eject foomatic-db-compressed-ppds +fonts-ubuntu fonts-ubuntu-console gdebi gconf2 diff --git a/config/desktop/jammy/environments/i3-wm/config_base/packages b/config/desktop/jammy/environments/i3-wm/config_base/packages index 2100e261e..368663eeb 100644 --- a/config/desktop/jammy/environments/i3-wm/config_base/packages +++ b/config/desktop/jammy/environments/i3-wm/config_base/packages @@ -40,6 +40,7 @@ fonts-nanum fonts-opensymbol fonts-stix fonts-symbola +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/jammy/environments/kde-plasma/config_base/packages b/config/desktop/jammy/environments/kde-plasma/config_base/packages index 2322f85b2..597259906 100644 --- a/config/desktop/jammy/environments/kde-plasma/config_base/packages +++ b/config/desktop/jammy/environments/kde-plasma/config_base/packages @@ -33,6 +33,7 @@ fonts-nanum fonts-opensymbol fonts-stix fonts-symbola +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/jammy/environments/mate/config_base/packages b/config/desktop/jammy/environments/mate/config_base/packages index 959609a55..5a47047ad 100644 --- a/config/desktop/jammy/environments/mate/config_base/packages +++ b/config/desktop/jammy/environments/mate/config_base/packages @@ -112,6 +112,7 @@ xdg-dbus-proxy xdg-desktop-portal xdg-user-dirs xdg-user-dirs-gtk +fonts-ubuntu xfonts-base xinput xorg-docs-core diff --git a/config/desktop/jammy/environments/xfce/config_base/packages b/config/desktop/jammy/environments/xfce/config_base/packages index a41b9a9aa..1de159561 100644 --- a/config/desktop/jammy/environments/xfce/config_base/packages +++ b/config/desktop/jammy/environments/xfce/config_base/packages @@ -18,6 +18,7 @@ evince evince-common fontconfig fontconfig-config +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/jammy/environments/xmonad/config_base/packages b/config/desktop/jammy/environments/xmonad/config_base/packages index 11d4b6cf9..9679a0c3b 100644 --- a/config/desktop/jammy/environments/xmonad/config_base/packages +++ b/config/desktop/jammy/environments/xmonad/config_base/packages @@ -37,6 +37,7 @@ fonts-nanum fonts-opensymbol fonts-stix fonts-symbola +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds ghostscript-x diff --git a/config/desktop/kinetic/environments/cinnamon/config_base/packages b/config/desktop/kinetic/environments/cinnamon/config_base/packages index 99d1b0f59..8bc54750b 100644 --- a/config/desktop/kinetic/environments/cinnamon/config_base/packages +++ b/config/desktop/kinetic/environments/cinnamon/config_base/packages @@ -28,6 +28,7 @@ evince evince-common fontconfig fontconfig-config +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/kinetic/environments/xfce/config_base/packages b/config/desktop/kinetic/environments/xfce/config_base/packages index a41b9a9aa..1de159561 100644 --- a/config/desktop/kinetic/environments/xfce/config_base/packages +++ b/config/desktop/kinetic/environments/xfce/config_base/packages @@ -18,6 +18,7 @@ evince evince-common fontconfig fontconfig-config +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/sid/environments/budgie/config_base/packages b/config/desktop/sid/environments/budgie/config_base/packages index 6e2b02b58..1d575ae20 100644 --- a/config/desktop/sid/environments/budgie/config_base/packages +++ b/config/desktop/sid/environments/budgie/config_base/packages @@ -154,6 +154,7 @@ xbacklight xcursor-themes xdg-user-dirs xdg-user-dirs-gtk +fonts-ubuntu xfonts-100dpi xfonts-75dpi xfonts-base diff --git a/config/desktop/sid/environments/cinnamon/config_base/packages b/config/desktop/sid/environments/cinnamon/config_base/packages index db0b04145..068172743 100644 --- a/config/desktop/sid/environments/cinnamon/config_base/packages +++ b/config/desktop/sid/environments/cinnamon/config_base/packages @@ -28,6 +28,7 @@ evince evince-common fontconfig fontconfig-config +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/sid/environments/kde-plasma/config_base/packages b/config/desktop/sid/environments/kde-plasma/config_base/packages index 48ac44cac..66c256d25 100644 --- a/config/desktop/sid/environments/kde-plasma/config_base/packages +++ b/config/desktop/sid/environments/kde-plasma/config_base/packages @@ -30,6 +30,7 @@ fonts-liberation fonts-nanum fonts-opensymbol fonts-stix +fonts-ubuntu fonts-symbola foomatic-db-compressed-ppds gdebi diff --git a/config/desktop/sid/environments/lxde/config_base/packages b/config/desktop/sid/environments/lxde/config_base/packages index 1264533a0..d7e89ce44 100644 --- a/config/desktop/sid/environments/lxde/config_base/packages +++ b/config/desktop/sid/environments/lxde/config_base/packages @@ -105,6 +105,7 @@ xarchiver xcursor-themes xdg-user-dirs xdg-user-dirs-gtk +fonts-ubuntu xfonts-100dpi xfonts-75dpi xfonts-base diff --git a/config/desktop/sid/environments/mate/config_base/packages b/config/desktop/sid/environments/mate/config_base/packages index 959609a55..5a47047ad 100644 --- a/config/desktop/sid/environments/mate/config_base/packages +++ b/config/desktop/sid/environments/mate/config_base/packages @@ -112,6 +112,7 @@ xdg-dbus-proxy xdg-desktop-portal xdg-user-dirs xdg-user-dirs-gtk +fonts-ubuntu xfonts-base xinput xorg-docs-core diff --git a/config/desktop/sid/environments/xfce/config_base/packages b/config/desktop/sid/environments/xfce/config_base/packages index 469eb02bf..0ea1b79f5 100644 --- a/config/desktop/sid/environments/xfce/config_base/packages +++ b/config/desktop/sid/environments/xfce/config_base/packages @@ -19,6 +19,7 @@ evince evince-common fontconfig fontconfig-config +fonts-ubuntu fonts-ubuntu-console foomatic-db-compressed-ppds gdebi diff --git a/lib/functions/main/config-prepare.sh b/lib/functions/main/config-prepare.sh index a8edab158..e99287694 100644 --- a/lib/functions/main/config-prepare.sh +++ b/lib/functions/main/config-prepare.sh @@ -156,6 +156,7 @@ function config_pre_main() { SELECTED_CONFIGURATION="cli_standard" elif [[ $BUILD_MINIMAL == "yes" ]]; then BUILD_DESKTOP=no + PLYMOUTH=no SELECTED_CONFIGURATION="cli_minimal" fi diff --git a/lib/functions/rootfs/distro-specific.sh b/lib/functions/rootfs/distro-specific.sh index 0295baeff..7ee320cf9 100644 --- a/lib/functions/rootfs/distro-specific.sh +++ b/lib/functions/rootfs/distro-specific.sh @@ -172,7 +172,7 @@ function create_sources_list() { else # use old method for compatibility reasons # @TODO: rpardini: not gonna fix this? cp "${SRC}"/config/armbian.key "${basedir}" - chroot "${basedir}" /bin/bash -c "cat armbian.key | apt-key add - > /dev/null 2>&1" + chroot "${basedir}" /bin/bash -c "cat armbian.key | apt-key add -" fi # stage: add armbian repository and install key diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin index eef90cc47..f709cd039 100644 --- a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin +++ b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin @@ -268,10 +268,13 @@ add_user() second_input="$password" echo "" if [[ "$first_input" == "$second_input" ]]; then - result="$(cracklib-check <<<"$password")" - okay="$(awk -F': ' '{ print $2}' <<<"$result")" - if [[ "$okay" != "OK" ]]; then - echo -e "\n\e[0;31mWarning:\x1B[0m Weak password, $okay \b!" + # minimal images might not have this + if command -v cracklib-check >/dev/null 2>&1; then + result="$(cracklib-check <<<"$password")" + okay="$(awk -F': ' '{ print $2}' <<<"$result")" + if [[ "$okay" != "OK" ]]; then + echo -e "\n\e[0;31mWarning:\x1B[0m Weak password, $okay \b!" + fi fi echo -e "" read -r -e -p "Please provide your real name: " -i "${RealUserName^}" RealName @@ -353,10 +356,13 @@ if [[ -f /root/.not_logged_in_yet && -n $(tty) ]]; then second_input="$password" echo "" if [[ "$first_input" == "$second_input" ]]; then - result="$(cracklib-check <<<"$password")" - okay="$(awk -F': ' '{ print $2}' <<<"$result")" - if [[ "$okay" != "OK" ]]; then - echo -e "\n\e[0;31mWarning:\x1B[0m Weak password, $okay \b!" + # minimal might not have this + if command -v cracklib-check >/dev/null 2>&1; then + result="$(cracklib-check <<<"$password")" + okay="$(awk -F': ' '{ print $2}' <<<"$result")" + if [[ "$okay" != "OK" ]]; then + echo -e "\n\e[0;31mWarning:\x1B[0m Weak password, $okay \b!" + fi fi (echo "$first_input";echo "$second_input";) | passwd root >/dev/null 2>&1 break