From bd5186961210d87018b223d0387477bbe5f87ba0 Mon Sep 17 00:00:00 2001
From: Aditya Garg <gargaditya08@live.com>
Date: Tue, 8 Nov 2022 11:17:41 +0530
Subject: [PATCH] Fix CI and scripts for 22.10

---
 .github/workflows/CI.yml | 10 +---------
 build_in_docker.sh       |  2 +-
 files/chroot_build.sh    |  4 +---
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index af1ffb0..e17509e 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -104,15 +104,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Build
-        run: |
-          DOCKER_IMAGE=ubuntu:22.10
-          docker pull ${DOCKER_IMAGE}
-          docker run \
-          -t \
-          -v "$(pwd)":/repo \
-          ${DOCKER_IMAGE} \
-          /bin/bash -c 'cd /repo && \
-          ./build.sh'
+        run: sudo ./build_in_docker.sh
 
       - name: print sha256sum
         run: cat output/sha256
diff --git a/build_in_docker.sh b/build_in_docker.sh
index b603421..0308516 100755
--- a/build_in_docker.sh
+++ b/build_in_docker.sh
@@ -2,7 +2,7 @@
 
 set -eu -o pipefail
 
-DOCKER_IMAGE=ubuntu:20.04
+DOCKER_IMAGE=ubuntu:22.10
 
 docker pull ${DOCKER_IMAGE}
 docker run \
diff --git a/files/chroot_build.sh b/files/chroot_build.sh
index 14a9a5b..404d3d1 100755
--- a/files/chroot_build.sh
+++ b/files/chroot_build.sh
@@ -81,7 +81,7 @@ apt install /tmp/headers.deb /tmp/image.deb
 echo >&2 "===]> Info: Install window manager... "
 
 apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
-  plymouth-theme-ubuntu-logo \
+  plymouth-theme-ubuntu-gnome-logo \
   ubuntu-desktop-minimal \
   ubuntu-gnome-wallpapers \
   snapd
@@ -177,8 +177,6 @@ echo >&2 "===]> Info: Reconfigure environment ... "
 locale-gen --purge en_US.UTF-8 en_US
 printf 'LANG="C.UTF-8"\nLANGUAGE="C.UTF-8"\n' >/etc/default/locale
 
-dpkg-reconfigure -f readline resolvconf
-
 cat <<EOF >/etc/NetworkManager/NetworkManager.conf
 [main]
 plugins=ifupdown,keyfile