Skip to content
Snippets Groups Projects
Commit 1f220ccb authored by Luis Guzmán's avatar Luis Guzmán Committed by Ruben Rodriguez
Browse files

Ubiquity 10 update URL & #27659

parent 4213eddb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
helpers/DATA/ubiquity/nabia_encrypt_by_default.patch 0 → 100644
+ 12
− 0
View file @ 1f220ccb
diff -ru ubiquity/plugins/ubi-partman.py ubiquity-diff/plugins/ubi-partman.py
--- ubiquity/plugins/ubi-partman.py 2021-02-09 07:58:29.000000000 -0600
+++ ubiquity-diff/plugins/ubi-partman.py 2021-02-25 13:54:40.725587116 -0600
@@ -739,6 +739,8 @@
if opt_desc:
opt_desc.show()
opt_desc.set_markup(fmt % options[option].desc)
+ if name == "use_crypto":
+ opt_widget.set_active(True)
if not ticked and opt_widget.get_sensitive():
opt_widget.set_active(True)
helpers/make-ubiquity
+ 17
− 15
View file @ 1f220ccb
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
# 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=13 VERSION=14
. ./config . ./config
# Enable full disk encryption by default # Enable full disk encryption by default
patch -p1 < $DATA/encrypt_by_default.patch patch -p0 < $DATA/nabia_encrypt_by_default.patch
cp $DATA/trisquel_installed.png pixmaps cp $DATA/trisquel_installed.png pixmaps
rm pixmaps/ubuntu_installed.png rm pixmaps/ubuntu_installed.png
...@@ -37,7 +37,7 @@ replace grub-efi-amd64-signed grub-efi-amd64 . ...@@ -37,7 +37,7 @@ replace grub-efi-amd64-signed grub-efi-amd64 .
/bin/sed '/canonical/d' -i debian/ubiquity.install* /bin/sed '/canonical/d' -i debian/ubiquity.install*
rm tests/test_ubi_partman* rm tests/test_ubi_partman*
sed 's/, ubuntu-artwork//' debian/control -i sed -i '0,/ubuntu-artwork/{/ubuntu-artwork/d;}' debian/control
export DEB_BUILD_OPTIONS=nocheck export DEB_BUILD_OPTIONS=nocheck
...@@ -64,7 +64,7 @@ set -e ...@@ -64,7 +64,7 @@ set -e
file="\$1" file="\$1"
FASTEST=https://archive.trisquel.info/trisquel/ FASTEST=https://archive.trisquel.org/trisquel/
SPEED=1000000000000 SPEED=1000000000000
for i in \$(grep 'tp:' /usr/share/python-apt/templates/Trisquel.mirrors) for i in \$(grep 'tp:' /usr/share/python-apt/templates/Trisquel.mirrors)
...@@ -101,11 +101,11 @@ chmod 755 d-i/source/apt-setup/generators/99trisquel ...@@ -101,11 +101,11 @@ chmod 755 d-i/source/apt-setup/generators/99trisquel
# Redirect ports.ubuntu.com # Redirect ports.ubuntu.com
sed '/ports.ubuntu.com/d' -i ./d-i/source/apt-setup/debian/apt-mirror-setup.install sed '/ports.ubuntu.com/d' -i ./d-i/source/apt-setup/debian/apt-mirror-setup.install
sed 's/ports.ubuntu.com/archive.trisquel.info/g; s/ubuntu-ports/trisquel/g; s/ubuntu/trisquel/g' -i ./d-i/source/apt-setup/debian/rules ./d-i/source/base-installer/library.sh sed 's/ports.ubuntu.com/archive.trisquel.org/g; s/ubuntu-ports/trisquel/g; s/ubuntu/trisquel/g' -i ./d-i/source/apt-setup/debian/rules ./d-i/source/base-installer/library.sh
sed 's/CC.ports.ubuntu.com/archive.trisquel.info/g; s/.ports.ubuntu.com/archive.trisquel.info/g' -i ./d-i/source/choose-mirror/choose-mirror.c ./d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in ./d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in sed 's/CC.ports.ubuntu.com/archive.trisquel.org/g; s/.ports.ubuntu.com/archive.trisquel.org/g' -i ./d-i/source/choose-mirror/choose-mirror.c ./d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in ./d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in
# Set Mirrors.masterlist # Set Mirrors.masterlist
wget https://archive.trisquel.info/trisquel/Mirrors.masterlist -O ./d-i/source/choose-mirror/Mirrors.masterlist wget https://archive.trisquel.org/trisquel/Mirrors.masterlist -O ./d-i/source/choose-mirror/Mirrors.masterlist
sed '/Location/d; /Comment/d;' -i ./d-i/source/choose-mirror/Mirrors.masterlist sed '/Location/d; /Comment/d;' -i ./d-i/source/choose-mirror/Mirrors.masterlist
cp ./d-i/source/choose-mirror/Mirrors.masterlist ./d-i/source/choose-mirror/Mirrors.masterlist.trisquel cp ./d-i/source/choose-mirror/Mirrors.masterlist ./d-i/source/choose-mirror/Mirrors.masterlist.trisquel
rm ./d-i/source/choose-mirror/Mirrors.masterlist.ubuntu rm ./d-i/source/choose-mirror/Mirrors.masterlist.ubuntu
...@@ -180,16 +180,19 @@ replace Kubuntu Triskel . ...@@ -180,16 +180,19 @@ replace Kubuntu Triskel .
replace kubuntu triskel . replace kubuntu triskel .
find | grep kubuntu.*svg | xargs rename s/kubuntu/triskel/ find | grep kubuntu.*svg | xargs rename s/kubuntu/triskel/
replace Trisquel-Gettext-Domain Ubuntu-Gettext-Domain replace Trisquel-Gettext-Domain Ubuntu-Gettext-Domain
## rebrand l18n
## Korean - Fix #27659
replace 우분투 Trisquel .
#replace triskel-ubiquity kubuntu-ubiquity #replace triskel-ubiquity kubuntu-ubiquity
replace "launchpad.net/ubuntu/+source/ubiquity/+filebug" "trisquel.info/project/issues" . replace "launchpad.net/ubuntu/+source/ubiquity/+filebug" "trisquel.info/project/issues" .
replace "launchpad.net/ubuntu/+source/ubiquity/" "trisquel.info/project/issues" . replace "launchpad.net/ubuntu/+source/ubiquity/" "trisquel.info/project/issues" .
replace "launchpad.net/ubuntu/+source/" "trisquel.info/project/issues" . replace "launchpad.net/ubuntu/+source/" "trisquel.info/project/issues" .
replace "ubiquity/+filebug" "" . replace "ubiquity/+filebug" "" .
replace "+filebug" "" . replace "+filebug" "" .
replace archive.ubuntu.com/ubuntu archive.trisquel.info/trisquel . replace archive.ubuntu.com/ubuntu archive.trisquel.org/trisquel .
replace security.ubuntu.com/trisquel archive.trisquel.info/trisquel . replace security.ubuntu.com/trisquel archive.trisquel.org/trisquel .
replace archive.ubuntu.com archive.trisquel.info . replace archive.ubuntu.com archive.trisquel.org .
replace security.ubuntu.com archive.trisquel.info . replace security.ubuntu.com archive.trisquel.org .
#sed -i 's/apt-install/true #apt-install/' ubiquity/components/check_kernels.py #sed -i 's/apt-install/true #apt-install/' ubiquity/components/check_kernels.py
sed -i 's/apt-install/true #apt-install/' scripts/check-kernels sed -i 's/apt-install/true #apt-install/' scripts/check-kernels
#sed -i '82s/True/False/g' gui/gtk/stepPrepare.ui #sed -i '82s/True/False/g' gui/gtk/stepPrepare.ui
...@@ -197,10 +200,10 @@ sed -i 's/apt-install/true #apt-install/' scripts/check-kernels ...@@ -197,10 +200,10 @@ sed -i 's/apt-install/true #apt-install/' scripts/check-kernels
rm -rf d-i/source/apt-setup/release-files/* rm -rf d-i/source/apt-setup/release-files/*
for DIST in $CODENAME $CODENAME-security $CODENAME-updates $CODENAME-backports for DIST in $CODENAME $CODENAME-security $CODENAME-updates $CODENAME-backports
do do
WD=d-i/source/apt-setup/release-files/archive.trisquel.info/$DIST WD=d-i/source/apt-setup/release-files/archive.trisquel.org/$DIST
mkdir $WD -p mkdir $WD -p
wget -r -l1 -np https://archive.trisquel.info/trisquel/dists/$DIST/Release -O $WD/Release wget -r -l1 -np https://archive.trisquel.org/trisquel/dists/$DIST/Release -O $WD/Release
wget -r -l1 -np https://archive.trisquel.info/trisquel/dists/$DIST/Release.gpg -O $WD/Release.gpg wget -r -l1 -np https://archive.trisquel.org/trisquel/dists/$DIST/Release.gpg -O $WD/Release.gpg
done done
cp $DATA/branding.svgz gui/qt/images/branding.svgz cp $DATA/branding.svgz gui/qt/images/branding.svgz
...@@ -271,4 +274,3 @@ changelog "Adapted for Trisquel" ...@@ -271,4 +274,3 @@ changelog "Adapted for Trisquel"
rm -rf debian/source rm -rf debian/source
compile compile
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment