Skip to content

Commit 7408913

Browse files
committed
Fix sound in firefox, remove chromium, get xsecurelock from testing
closes #140, #139
1 parent c2fb359 commit 7408913

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

resources/InstallResources/default.pa

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,5 +138,5 @@ load-module module-filter-apply
138138
### Make some devices default
139139
#set-default-sink output
140140
#set-default-source input
141-
load-module module-alsa-sink device=sysdefault
142-
load-module module-alsa-source device=sysdefault
141+
# load-module module-alsa-sink device=sysdefault
142+
# load-module module-alsa-source device=sysdefault

scripts/InstallScripts/InstallPackages.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ dpkg-reconfigure tzdata
3737
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
3838
DEBIAN_FRONTEND=noninteractive apt install -y network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome
3939

40-
# #install firefox from buster (if buster repos are present, i.e. installed suite is less than bullseye), otherwise from default suite
41-
DEBIAN_FRONTEND=noninteractive apt -t buster install -y firefox-esr || DEBIAN_FRONTEND=noninteractive apt install -y firefox-esr
42-
43-
# #install chromium from buster (if buster repos are present, i.e. installed suite is less than bullseye), otherwise from default suite
44-
DEBIAN_FRONTEND=noninteractive apt -t buster install -y chromium || DEBIAN_FRONTEND=noninteractive apt install -y chromium
40+
DEBIAN_FRONTEND=noninteractive apt install -y firefox-esr
4541

4642
[ "$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
4743
[ "$DE" = "lxqt" ] && apt install -y lxqt pavucontrol-qt
@@ -74,7 +70,7 @@ then
7470
# is told to sleep at lid close, and activate lock
7571
# gnome-screensaver shows the desktop for a fraction of a second at wakeup
7672
# xscreensaver works as well, if you prefer that but is less simple
77-
DEBIAN_FRONTEND=noninteractive apt install -y -t unstable xsecurelock
73+
DEBIAN_FRONTEND=noninteractive apt install -y -t testing xsecurelock
7874

7975
#Install packages not in an apt repo
8076
dpkg -i $DIR/xfce-themes/*
@@ -132,6 +128,8 @@ fi
132128

133129
#Copy in acpi, pulse audio, trackpad settings, funtion key settings
134130
cp -rf $DIR/default.pa /etc/pulse/default.pa
131+
# Disable flat-volumes in pulseaudio, fixes broken sound for some sources in firefox
132+
echo "flat-volumes = no" > /etc/pulse/daemon.conf
135133
cp -rf $DIR/sound.sh /etc/acpi/sound.sh
136134
cp -rf $DIR/headphone-acpi-toggle /etc/acpi/events/headphone-acpi-toggle
137135
mkdir /etc/X11/xorg.conf.d/

scripts/buildFilesystem.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,13 @@ chroot $outmnt apt-get clean
168168
chroot $outmnt apt install -y libinput-tools xdotool build-essential
169169
#Package is copied into /InstallResources/packages
170170

171-
chroot $outmnt apt-get install -y -t unstable -d xsecurelock
171+
chroot $outmnt apt-get install -y -t testing -d xsecurelock
172172

173173
#Download the packages to be installed by Install.sh:
174174
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
175175

176176
chroot $outmnt apt-get install -d -y firefox-esr
177177
# grab chromium as well, since sound is still broken in firefox for some media
178-
chroot $outmnt apt-get install -d -y chromium
179178

180179
#Cleanup hosts
181180
rm -rf $outmnt/etc/hosts #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests

0 commit comments

Comments
 (0)