From d66016624dc053c12b1c9aa927c17c02ccf64799 Mon Sep 17 00:00:00 2001 From: Hal Emmerich Date: Fri, 7 Jun 2019 13:42:25 -0500 Subject: [PATCH] Change to using buster as the default suite Install chromium by default, fix script inconsistency closes #97 --- makefile | 2 +- scripts/InstallScripts/InstallPackages.sh | 6 +++--- scripts/buildFilesystem.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/makefile b/makefile index 7d89c82..eb4b571 100644 --- a/makefile +++ b/makefile @@ -15,7 +15,7 @@ KVER=4.17.19 ifeq ($(PRAWNOS_SUITE),) -PRAWNOS_SUITE=stretch +PRAWNOS_SUITE=buster endif OUTNAME=PrawnOS-$(PRAWNOS_SUITE)-Alpha-c201-libre-2GB.img BASE=$(OUTNAME)-BASE diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh index 4c1de05..34f7896 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/scripts/InstallScripts/InstallPackages.sh @@ -37,12 +37,12 @@ dpkg-reconfigure tzdata DEBIAN_FRONTEND=noninteractive apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils mousepad vlc dconf-cli dconf-editor sudo dtrx emacs25 DEBIAN_FRONTEND=noninteractive apt install -y network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome -# #install chromium from sid -# apt -t unstable install -y chromium - # #install firefox from buster (if buster repos are present, i.e. installed suite is less than bullseye), otherwise from default suite DEBIAN_FRONTEND=noninteractive apt -t buster install -y firefox-esr || DEBIAN_FRONTEND=noninteractive apt install -y firefox-esr +# #install chromium from buster (if buster repos are present, i.e. installed suite is less than bullseye), otherwise from default suite +DEBIAN_FRONTEND=noninteractive apt -t buster install -y chromium || DEBIAN_FRONTEND=noninteractive apt install -y chromium + [ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies numix-gtk-theme plank accountsservice [ "$DE" = "lxqt" ] && apt install -y lxqt pavucontrol-qt diff --git a/scripts/buildFilesystem.sh b/scripts/buildFilesystem.sh index 06df3c9..e010ca6 100755 --- a/scripts/buildFilesystem.sh +++ b/scripts/buildFilesystem.sh @@ -81,10 +81,10 @@ create_image() { mount -o noatime ${2}p2 $5 } -# use stretch if no suite is specified +# use buster if no suite is specified if [ "$PRAWNOS_SUITE" = "" ] then - PRAWNOS_SUITE=stretch + PRAWNOS_SUITE=buster fi # create a 2GB image with the Chrome OS partition layout