Cleanups and fixes

This commit is contained in:
Aleksey Samoilov 2022-05-05 16:25:16 +04:00
parent d662ef0284
commit 29d56546a7
4 changed files with 8 additions and 35 deletions

View file

@ -26,7 +26,6 @@ echo -e "
apt-get update
apt-get install -y live-build patch binutils zstd
dpkg -i ./debs/*.deb
patch /usr/lib/live/build/binary_grub-efi < live-build-fix-shim-remove.patch
build () {
BUILD_ARCH="$1"

View file

@ -41,12 +41,6 @@ menuentry "Start Ubuntu Sway Remix" --class ubuntu {
set gfxpayload=keep
linux /casper/vmlinuz boot=casper ---
initrd /casper/initrd.lz
}
menuentry "Start Ubuntu Sway Remix (Safe Graphics)" --class recovery {
set gfxpayload=keep
linux /casper/vmlinuz boot=casper nomodeset ---
initrd /casper/initrd.lz
}
menuentry "Check for Disk Defects" --class memtest {
set gfxpayload=keep

View file

@ -3,26 +3,16 @@
echo "P: Begin executing remove-blacklisted-packages chroot hook..."
#dist="$(lsb_release -c -s -u 2>&1)"||dist="$(lsb_release -c -s)"
dist="$(lsb_release -c -s -u 2>&1)"||dist="$(lsb_release -c -s)"
#apt-get install --no-install-recommends -f -q -y bzr
apt-get install --no-install-recommends -f -q -y git
#bzr export --quiet ubuntu-seeds "lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu.$dist"
git clone --depth 1 https://github.com/Ubuntu-Sway/seeds.git --single-branch --branch "$dist"
#bzr export --quiet platform "lp:~ubuntu-core-dev/ubuntu-seeds/platform.$dist"
for package in $(cat 'seeds/blacklist' | grep -v '#'); do
apt-get autoremove --purge -f -q -y "$package"
done
#for package in $(cat 'platform/blacklist' 'ubuntu-seeds/blacklist' | grep -v '#'); do
# apt-get autoremove --purge -f -q -y "$package"
#done
apt-get autoremove --purge -f -q -y git
#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 xiterm+thai gnome-control-center language-selector-gnome yelp gnome-font-viewer gnome-software gnome-software-common gnome-software-plugin-snap plasma-framework libkf5plasma5
rm -R ../ubuntu-seeds ../platform
rm -rf /etc/xdg/autostart/nm-applet.desktop
cp /etc/rc.local /etc/rc.local.orig
sed -i "s/exit 0/rm -fR \/var\/lib\/apt\/lists\/*/" /etc/rc.local
sed -i 's/OnlyShowIn=GNOME;Unity;/#OnlyShowIn=GNOME;Unity;/g' /usr/share/applications/gnome-session-properties.desktop
echo "mv /etc/rc.local.orig /etc/rc.local" >> /etc/rc.local
echo "exit 0" >> /etc/rc.local
rm -R ../seeds

View file

@ -1,10 +0,0 @@
283,284c283,288
< # Removing depends
< Remove_packages
---
> # Removing depends, some bootloader packages are marked as Protected/Important
> # in Ubuntu, so temporarily add an apt flag to allow them to be removed
> PRE_APT_OPTIONS="${APT_OPTIONS}"
> APT_OPTIONS="${APT_OPTIONS} --allow-remove-essential"
> Remove_packages
> APT_OPTIONS="${PRE_APT_OPTIONS}"