From d363bce2a48c4d511d2245ad80fc3ee8a8f720cb Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Wed, 20 Apr 2022 15:55:02 +0400 Subject: [PATCH] Some fixes --- etc/config/archives/ubuntu-sway.key | 33 ------------------- etc/config/archives/ubuntu-sway.list | 1 - .../000-remove-blacklisted-packages.chroot | 2 +- .../desktop.list.chroot_install | 2 +- .../desktop.list.chroot_live | 1 - .../package-lists.calamares/pool.list.binary | 1 - 6 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 etc/config/archives/ubuntu-sway.key delete mode 100644 etc/config/archives/ubuntu-sway.list diff --git a/etc/config/archives/ubuntu-sway.key b/etc/config/archives/ubuntu-sway.key deleted file mode 100644 index 5ed4f16..0000000 --- a/etc/config/archives/ubuntu-sway.key +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Comment: Use "gpg --dearmor" for unpacking - -AAAAIAEBAAJLQlhmAAAAAGJT2DBiU9gwAAAAAAAAAAAAAAUWAgEAAAAAAF4AAASk -AAEAHL35u3fKU9AmeltwTVWJGU5dfOvZAAAAIAAAAAAAAAABAAwAAAJ+AAAAHQAA -AAAAAQAEAAAAAAAAAAAAAAAAAAAAAGJT2DAAAAAAmQINBGJTyJ4BEADacFFXD51y -1TDIxD+1/kU9xVM1xF6Fj05j6XBUW86DG2pQOgBL0+k2K0UYEoHZpGT9VoLH4V46 -yGFjodpzPUsPHt4BJGNpaqRteJbV0MUvLHJJnWEyx+aX0DKcszL+Nq0QLycEI4h4 -nbM9zbqQUmw2qYLNwse60wwNwJaHo+vagSWqCRlcBUfJjp+IP2YulcCJ3EQnqdiy -V8C+HHKgYVZb9b/hMuElM7FbX26kLTCUb/wJI7ZbLw5neK5c3R6vWkcLiT58fd+F -Fxdex/8P83+rI/N/iTZYN+F1FhMgZ/pbJO3dnNh+OUH4a0Aw6VC5oQ7luu+wWv1U -unD5liYsJB+Fb6j7d4mt4K00HGGRoafTowvqgaN7Q/SUng54AXNHcspdPVJ89gTi -mWxR9EMvF8Oen8aWj9hTqlhWe3gH/oxL1vmBoos/94O3v7dzbqS1R7rI+ZmvmBfG -i5fIxyhZnRcnvHrq6hbRq+hpRqiK4NnN95hmHt4avvVieN9WyRkD8MhOYhAUvwlj -nNIp+OWgjrdpx7Zse5ZBt4x8rt48a3lpRDcxogR6BVkaKFgp/N/9V4o3N56zkp9h -xc0my86wQ4pEuH43AAbt3yUTpAwrIZC0sZ4X8h3f00SG5jxMfeaAT+1aoJpE2vYm -bVIC7wOXqXXXCLhRTthD6q91C/NRvw4IbwARAQABsAwAAGdwZwEAAAAAAAC0HUxh -dW5jaHBhZCBQUEEgZm9yIFVidW50dSBTd2F5sAwAAGdwZwIAAAAAAACJAk4EEwEK -ADgWIQS9+bt3ylPQJnpbcE1ViRlOXXzr2QUCYlPIngIbAwULCQgHAgYVCgkICwIE -FgIDAQIeAQIXgAAKCRBViRlOXXzr2TgbD/0VUMD7QtYtkb3/jS2b7lPWRi335jen -tEaAViP1k8mMdq/bKuiwZ4DYBR5eI/J8kJuZZLa0QMCDNGacAfTn/t7XlLWDDCft -n746df6j8BZjzXzdygPRE8TTi8FYQKY7mVmL9eqeG7Y12V43qwB6eJtJeUbZcXA+ -CmMwBpgQWKwvZJNxqZJXO3BPXJFXeva+3ADRtNOXaMy0p3nsjZZ6G1PsWb2g8jJA -PhqWvF3h5B0MM3j4X1ME/RhANzFN1evhoN/kXT9UzrDOxkkVFZ5xT4kLf9HXDttP -FjxBZxKLnTWGsWAn5P7vE7MFKBjN9cu5KdZIclPgzBV2bJQ9fq9C4XiNR9ljROqG -mNSYXLfxQxZ9wwlC6qAKVFZ7VKdl+Nq4ACwHehcCWag0Ow5D7jo8hymZ1K1EWNiJ -SMJVXlbDSKOXR12wjCqqBAJItq3uS2W6i8JeslrzSoGEAS6baQayJ85Q/Zy4vLkd -lVXKcXtiqomHYk+2LeY9DMw7IA2jhTmU8EE8nRtTdOZPnjrJSIRxfZ3R3D9YXxyS -NF87MhV8H4ot2u+4d6Q8VfhW15ORRXkZsklH9GygX9k6KSzMP/C7J3BAqtjr7i3N -oJ3yQ5FM07wxvfVxr6s4XjG9E2bt0blGQ06I3F1/AXuuWyJr8a8imHjnorAbpYyv -fkKZ8OZ/P4kguLAGAANncGcACqxB3OSraMlsnQx65Bj0if9uB5k= -=gd+3 ------END PGP PUBLIC KEY BLOCK----- diff --git a/etc/config/archives/ubuntu-sway.list b/etc/config/archives/ubuntu-sway.list deleted file mode 100644 index 94a53fd..0000000 --- a/etc/config/archives/ubuntu-sway.list +++ /dev/null @@ -1 +0,0 @@ -deb https://ppa.launchpadcontent.net/ubuntu-sway/stable/ubuntu jammy main diff --git a/etc/config/hooks/live/000-remove-blacklisted-packages.chroot b/etc/config/hooks/live/000-remove-blacklisted-packages.chroot index 673a615..e7a7f52 100755 --- a/etc/config/hooks/live/000-remove-blacklisted-packages.chroot +++ b/etc/config/hooks/live/000-remove-blacklisted-packages.chroot @@ -18,7 +18,7 @@ echo "P: Begin executing remove-blacklisted-packages chroot hook..." #apt-get autoremove --purge -f -q -y bzr apt-get autoremove --purge -f -q -y metacity unity-greeter unity-settings-daemon unity-control-center -apt-get autoremove --purge -f -q -y gdm3 gnome-shell ubuntu-desktop mutter mpv xiterm+thai gnome-control-center language-selector-gnome yelp gnome-font-viewer gnome-software gnome-software-common gnome-software-plugin-snap +apt-get autoremove --purge -f -q -y gdm3 gnome-shell ubuntu-desktop mutter xiterm+thai gnome-control-center language-selector-gnome yelp gnome-font-viewer gnome-software gnome-software-common gnome-software-plugin-snap snapd network-manager-config-connectivity network-manager-config-connectivity-ubuntu network-manager-config-connectivity-debian rm -R ../ubuntu-seeds ../platform rm -rf /etc/xdg/autostart/nm-applet.desktop cp /etc/rc.local /etc/rc.local.orig diff --git a/etc/config/package-lists.calamares/desktop.list.chroot_install b/etc/config/package-lists.calamares/desktop.list.chroot_install index dfb3d9a..95ea814 100644 --- a/etc/config/package-lists.calamares/desktop.list.chroot_install +++ b/etc/config/package-lists.calamares/desktop.list.chroot_install @@ -1,2 +1,2 @@ ubuntu-minimal -ubuntu-sway-desktop +ubuntusway-desktop diff --git a/etc/config/package-lists.calamares/desktop.list.chroot_live b/etc/config/package-lists.calamares/desktop.list.chroot_live index 448ede8..aeebcfb 100644 --- a/etc/config/package-lists.calamares/desktop.list.chroot_live +++ b/etc/config/package-lists.calamares/desktop.list.chroot_live @@ -3,7 +3,6 @@ expect gparted calamares-settings-ubuntusway cifs-utils -lupin-casper language-pack-en language-pack-gnome-en xfsprogs diff --git a/etc/config/package-lists.calamares/pool.list.binary b/etc/config/package-lists.calamares/pool.list.binary index 3f438d1..47e17ec 100644 --- a/etc/config/package-lists.calamares/pool.list.binary +++ b/etc/config/package-lists.calamares/pool.list.binary @@ -3,7 +3,6 @@ bcmwl-kernel-source dkms intel-microcode iucode-tool -lupin-support setserial user-setup efibootmgr