From 6bdd2abbaffddae6fc7242a62527d5f9d8c5f210 Mon Sep 17 00:00:00 2001 From: Hal Emmerich Date: Mon, 2 Dec 2019 20:39:48 -0600 Subject: [PATCH] Changed how disable_ertm gets set, previous fix didn't work Also added bluetooth package --- scripts/InstallScripts/InstallPackages.sh | 7 +++++-- scripts/buildFilesystem.sh | 5 +---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh index 3844402..31f9095 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/scripts/InstallScripts/InstallPackages.sh @@ -34,7 +34,7 @@ done dpkg-reconfigure tzdata #Install shared packages -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 emacs +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 emacs sysfsutils bluetooth DEBIAN_FRONTEND=noninteractive apt install -y network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome # #install firefox from buster (if buster repos are present, i.e. installed suite is less than bullseye), otherwise from default suite @@ -60,6 +60,9 @@ patch /usr/share/X11/xkb/rules/evdev.xml < $DIR/xkb/rules/evdev.xml.chromebook.p cp $DIR/xkb/keyboard /etc/default/keyboard +#disable ertm for csr8510 bluetooth, issue #117 +echo "module/bluetooth/parameters/disable_ertm = 1" > /etc/sysfs.conf + if [ "$DE" = "xfce" ] then # remove light-locker, as it is broken on this machine. See issue https://github.com/SolidHal/PrawnOS/issues/56#issuecomment-504681175 @@ -175,7 +178,7 @@ do done done -usermod -a -G sudo,netdev,input,video $username +usermod -a -G sudo,netdev,input,video,bluetooth $username dmesg -E diff --git a/scripts/buildFilesystem.sh b/scripts/buildFilesystem.sh index 939eb4b..1d9602d 100755 --- a/scripts/buildFilesystem.sh +++ b/scripts/buildFilesystem.sh @@ -154,9 +154,6 @@ chroot $outmnt apt install -y udev kmod net-tools inetutils-ping traceroute ipro cp -f $build_resources/external_fstab $outmnt/etc/fstab chmod 644 /etc/fstab -#disable ertm for csr8510 bluetooth, issue #117 -echo "options bluetooth disable_ertm=Y" > $outmnt/etc/modprobe.d/bluetooth.conf - #Cleanup to reduce install size chroot $outmnt apt-get autoremove --purge chroot $outmnt apt-get clean @@ -168,7 +165,7 @@ chroot $outmnt apt install -y libinput-tools xdotool build-essential 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 papirus-icon-theme +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 papirus-icon-theme sysfsutils bluetooth chroot $outmnt apt-get install -d -y firefox-esr # grab chromium as well, since sound is still broken in firefox for some media