g/PrawnOS-nonfree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix sound in firefox, remove chromium, get xsecurelock from testing

Browse Source 
closes #140, #139
This commit is contained in:
Hal Emmerich 2020-01-11 16:37:14 -06:00
parent c2fb359782
commit 7408913bb4
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/InstallResources/default.pa
View File

@ -138,5 +138,5 @@ load-module module-filter-apply
### Make some devices default ### Make some devices default
#set-default-sink output #set-default-sink output
#set-default-source input #set-default-source input
load-module module-alsa-sink device=sysdefault # load-module module-alsa-sink device=sysdefault
load-module module-alsa-source device=sysdefault # load-module module-alsa-source device=sysdefault

10
scripts/InstallScripts/InstallPackages.sh
View File

@ -37,11 +37,7 @@ 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 emacs sysfsutils bluetooth 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 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 DEBIAN_FRONTEND=noninteractive apt install -y firefox-esr
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 papirus-icon-theme [ "$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 papirus-icon-theme
[ "$DE" = "lxqt" ] && apt install -y lxqt pavucontrol-qt [ "$DE" = "lxqt" ] && apt install -y lxqt pavucontrol-qt
@ -74,7 +70,7 @@ then
# is told to sleep at lid close, and activate lock # is told to sleep at lid close, and activate lock
# gnome-screensaver shows the desktop for a fraction of a second at wakeup # gnome-screensaver shows the desktop for a fraction of a second at wakeup
# xscreensaver works as well, if you prefer that but is less simple # xscreensaver works as well, if you prefer that but is less simple
DEBIAN_FRONTEND=noninteractive apt install -y -t unstable xsecurelock DEBIAN_FRONTEND=noninteractive apt install -y -t testing xsecurelock
#Install packages not in an apt repo #Install packages not in an apt repo
dpkg -i $DIR/xfce-themes/* dpkg -i $DIR/xfce-themes/*
@ -132,6 +128,8 @@ fi
#Copy in acpi, pulse audio, trackpad settings, funtion key settings #Copy in acpi, pulse audio, trackpad settings, funtion key settings
cp -rf $DIR/default.pa /etc/pulse/default.pa cp -rf $DIR/default.pa /etc/pulse/default.pa
# Disable flat-volumes in pulseaudio, fixes broken sound for some sources in firefox
echo "flat-volumes = no" > /etc/pulse/daemon.conf
cp -rf $DIR/sound.sh /etc/acpi/sound.sh cp -rf $DIR/sound.sh /etc/acpi/sound.sh
cp -rf $DIR/headphone-acpi-toggle /etc/acpi/events/headphone-acpi-toggle cp -rf $DIR/headphone-acpi-toggle /etc/acpi/events/headphone-acpi-toggle
mkdir /etc/X11/xorg.conf.d/ mkdir /etc/X11/xorg.conf.d/

3
scripts/buildFilesystem.sh
View File

@ -168,14 +168,13 @@ chroot $outmnt apt-get clean
chroot $outmnt apt install -y libinput-tools xdotool build-essential chroot $outmnt apt install -y libinput-tools xdotool build-essential
#Package is copied into /InstallResources/packages #Package is copied into /InstallResources/packages
chroot $outmnt apt-get install -y -t unstable -d xsecurelock chroot $outmnt apt-get install -y -t testing -d xsecurelock
#Download the packages to be installed by Install.sh: #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 sysfsutils bluetooth 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 chroot $outmnt apt-get install -d -y firefox-esr
# grab chromium as well, since sound is still broken in firefox for some media # grab chromium as well, since sound is still broken in firefox for some media
chroot $outmnt apt-get install -d -y chromium
#Cleanup hosts #Cleanup hosts
rm -rf $outmnt/etc/hosts #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests rm -rf $outmnt/etc/hosts #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests