From 181da9812439c039d9d94b6db2cdaf3b4ba36315 Mon Sep 17 00:00:00 2001
From: bicubico <nunez.alejandro@gmail.com>
Date: Mon, 20 Feb 2023 16:13:21 -0300
Subject: [PATCH] to buster

---
 CHIP-updater/buster_x11.txt       | 31 ++++++++++++++++++++++++
 CHIP-updater/jessie-to-stretch.sh |  2 +-
 CHIP-updater/stretch_to_buster.sh | 39 ++++++-------------------------
 3 files changed, 39 insertions(+), 33 deletions(-)
 create mode 100644 CHIP-updater/buster_x11.txt

diff --git a/CHIP-updater/buster_x11.txt b/CHIP-updater/buster_x11.txt
new file mode 100644
index 0000000..847452a
--- /dev/null
+++ b/CHIP-updater/buster_x11.txt
@@ -0,0 +1,31 @@
+Section "Files"
+        ModulePath "/usr/lib/arm-linux-gnueabihf/xorg/modules/"
+        ModulePath "/usr/lib/xorg/modules/"
+EndSection
+
+Section "Monitor"
+	Identifier	"VGA"
+	Option		"PreferredMode"	"1024x768_60.00"
+EndSection
+
+Section "Monitor"
+	Identifier	"HDMI"
+	Option		"PreferredMode"	"1280x720_60.00"
+EndSection
+
+Section "Monitor"
+	Identifier	"Composite"
+	Option		"PreferredMode"	"NTSC10"
+EndSection
+
+
+Section "Screen"
+	Identifier	"Screen0"
+	Device		"Card0"
+EndSection
+
+
+Section "Device"
+	Identifier	"Card0"
+	Driver		"fbdev"
+EndSection
diff --git a/CHIP-updater/jessie-to-stretch.sh b/CHIP-updater/jessie-to-stretch.sh
index 499e01b..e53ea77 100644
--- a/CHIP-updater/jessie-to-stretch.sh
+++ b/CHIP-updater/jessie-to-stretch.sh
@@ -27,7 +27,7 @@ mv stretch_source_list.txt /etc/apt/sources.list
 
 echo "."
 echo "*** apt update & upgrade ***"
-apt-get update && apt-get upgrade -y
+apt-get update && apt-get full-upgrade -y
 sleep 5
 
 # Define network variables
diff --git a/CHIP-updater/stretch_to_buster.sh b/CHIP-updater/stretch_to_buster.sh
index 499e01b..ece6e3b 100644
--- a/CHIP-updater/stretch_to_buster.sh
+++ b/CHIP-updater/stretch_to_buster.sh
@@ -1,47 +1,22 @@
 #!/bin/bash
 
-# Upgrade jessie
+# Upgrade from stretch to buster
 echo "."
 echo "*** Updating and upgrading Debian Jessie. ***"
 mv /etc/apt/sources.list /etc/apt/sources.list.bak
-wget https://raw.githubusercontent.com/asophila/Flash-CHIP/master/CHIP-updater/jessie_source_list.txt
-mv jessie_source_list.txt /etc/apt/sources.list
-
-echo "."
-echo "*** Installing debian keyring. ***"
-apt-get update
-apt-get install debian-keyring debian-archive-keyring -y --force-yes
-sleep 5
+wget https://raw.githubusercontent.com/asophila/Flash-CHIP/master/CHIP-updater/buster_source_list.txt
+mv buster_source_list.txt /etc/apt/sources.list
 
 echo "."
 echo "*** apt update & upgrade ***"
-apt-get update && apt-get upgrade -y
+apt-get update && apt-get full-upgrade -y
 sleep 5
 
-# Upgrade from jessie to stretch 
-echo "."
-echo "*** Upgrading Debian Jessie to Debian Stretch ***"
-sudo mv /etc/apt/sources.list /etc/apt/sources.list.bak2
-wget https://raw.githubusercontent.com/asophila/Flash-CHIP/master/CHIP-updater/stretch_source_list.txt
-mv stretch_source_list.txt /etc/apt/sources.list
 
-echo "."
-echo "*** apt update & upgrade ***"
-apt-get update && apt-get upgrade -y
-sleep 5
-
-# Define network variables
-sudo chmod 666 /etc/NetworkManager/NetworkManager.conf
-echo -e "[connection]" >> /etc/NetworkManager/NetworkManager.conf
-echo -e "wifi.mac-address-randomization=1" >> /etc/NetworkManager/NetworkManager.conf
-echo -e "" >> /etc/NetworkManager/NetworkManager.conf
-echo -e "[device]" >> /etc/NetworkManager/NetworkManager.conf
-echo -e "wifi.scan-rand-mac-address=no" >> /etc/NetworkManager/NetworkManager.conf
-
-# Define X11 variables for stretch
+# Define X11 variables for buster
 sudo mv /etc/X11/xorg.conf /etc/X11/xorg.conf.bak
-wget https://raw.githubusercontent.com/asophila/Flash-CHIP/master/CHIP-updater/stretch_x11.txt
-mv stretch_x11.txt /etc/X11/xorg.conf
+wget https://raw.githubusercontent.com/asophila/Flash-CHIP/master/CHIP-updater/buster_x11.txt
+mv buster_x11.txt /etc/X11/xorg.conf
 
 echo "."
 echo "*** Update to Stretch finished. Reboot to continue the process. ***"
\ No newline at end of file