ubiquity: disabled disk encryption as default, improved a11y startup, remove nonfree repo setup cases
This commit is contained in:
parent
f8c7dea698
commit
704fcbd999
1 changed files with 12 additions and 4 deletions
|
|
@ -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=18
|
VERSION=19
|
||||||
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"
|
||||||
|
|
||||||
|
|
@ -27,12 +27,20 @@ EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
|
||||||
#Patch python test after tzdata update.
|
#Patch python test after tzdata update.
|
||||||
sed 's/Canada/Bahamas/' -i ./tests/test_timezone.py
|
sed 's/Canada/Bahamas/' -i ./tests/test_timezone.py
|
||||||
|
|
||||||
# Enable full disk encryption by default
|
# Enable full disk encryption by default. Disabled, as it hinders a11y and sighted people can choose to enable it.
|
||||||
patch -p0 < $DATA/nabia_encrypt_by_default.patch
|
#patch -p0 < $DATA/nabia_encrypt_by_default.patch
|
||||||
|
|
||||||
# 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
|
||||||
|
sed '2aimport psutil' -i ubiquity/source/bin/ubiquity-dm
|
||||||
|
sed 's/osextras.find_on_path.*orca.*/"orca" not in (p.name() for p in psutil.process_iter()):/' -i ubiquity/source/bin/ubiquity-dm
|
||||||
|
|
||||||
|
# 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 '/universe multiverse/d' -i bin/oem-config-remaster
|
||||||
|
|
||||||
cp $DATA/trisquel_installed.png pixmaps
|
cp $DATA/trisquel_installed.png pixmaps
|
||||||
rm pixmaps/ubuntu_installed.png
|
rm pixmaps/ubuntu_installed.png
|
||||||
replace ubuntu_installed trisquel_installed .
|
replace ubuntu_installed trisquel_installed .
|
||||||
|
|
@ -247,7 +255,7 @@ screen-reader-enabled=true
|
||||||
[org.mate.applications-at-visual]
|
[org.mate.applications-at-visual]
|
||||||
startup=true
|
startup=true
|
||||||
|
|
||||||
[org.mate.interface]
|
[org.mate.desktop.interface]
|
||||||
accessibility=true
|
accessibility=true
|
||||||
|
|
||||||
[org.gnome.desktop.a11y.applications]
|
[org.gnome.desktop.a11y.applications]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue