CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ubiquity: fully disabled launching orca on ubiquity-dm

Browse source
This commit is contained in:
Ruben Rodriguez 2021-11-25 20:34:02 -05:00
parent 59b44f732d
commit 6dcaac85e9
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
helpers/make-ubiquity
View file

@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=19 VERSION=20
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe' EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
#REPOKEY="871920D1991BC93C" #REPOKEY="871920D1991BC93C"
@ -33,9 +33,8 @@ sed 's/Canada/Bahamas/' -i ./tests/test_timezone.py
# Fix some gtk labels for Orca # Fix some gtk labels for Orca
patch -p1 < $DATA/a11y.patch patch -p1 < $DATA/a11y.patch
# Do not unconditionally try to start orca on ubiquity-dm # Do not try to start orca on ubiquity-dm
sed '2aimport psutil' -i bin/ubiquity-dm sed 's/osextras.find_on_path.*orca.*/False: #disabled by trisquel changes/' -i bin/ubiquity-dm
sed 's/osextras.find_on_path.*orca.*/"orca" not in (p.name() for p in psutil.process_iter()):/' -i bin/ubiquity-dm
# Disable non-main repository handling # Disable non-main repository handling
sed 's/main.*//' -i autopilot/ubiquity-autopilot-runner/custom-installation/iso-override/etc/apt/sources.list.d/all.list sed 's/main.*//' -i autopilot/ubiquity-autopilot-runner/custom-installation/iso-override/etc/apt/sources.list.d/all.list