diff --git a/scripts/buildFilesystem.sh b/scripts/buildFilesystem.sh index 59d76fc..6cb114e 100755 --- a/scripts/buildFilesystem.sh +++ b/scripts/buildFilesystem.sh @@ -176,23 +176,9 @@ chroot $outmnt apt-get install -y -t unstable -d xsecurelock #Download the packages to be installed by Install.sh: chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-cli dconf-editor plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs accountsservice sudo pavucontrol-qt -if [ "$PRAWNOS_SUITE" = "stretch" ] -then - CHROMIUM_SUITE=buster -else - CHROMIUM_SUITE=$PRAWNOS_SUITE -fi +chroot $outmnt apt-get install -d -y firefox-esr # grab chromium as well, since sound is still broken in firefox for some media -chroot $outmnt apt-get -t $CHROMIUM_SUITE install -d -y chromium - -if [ "$PRAWNOS_SUITE" = "stretch" ] -then - FIREFOX_SUITE=buster -else - FIREFOX_SUITE=$PRAWNOS_SUITE -fi -# #grab firefox from buster or higher, since stretch is broken -chroot $outmnt apt-get -t $FIREFOX_SUITE install -d -y firefox-esr +chroot $outmnt apt-get install -d -y chromium #Cleanup hosts rm -rf $outmnt/etc/hosts #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests