diff --git a/helpers/DATA/ubiquity/stepPartAsk.ui b/helpers/DATA/ubiquity/stepPartAsk.ui new file mode 100644 index 0000000..f37bc47 --- /dev/null +++ b/helpers/DATA/ubiquity/stepPartAsk.ui @@ -0,0 +1,406 @@ + + + + + True + False + 20 + 24 + 24 + + + True + False + 3 + 12 + + + True + False + 0 + 0 + This computer currently has Ubuntu 11.04 on it. What would you like to do? + True + 45 + use_device + + + 0 + 0 + 1 + 1 + + + + + True + False + 24 + + + True + False + + + False + 24 + 0 + 0 + <span size="small">Documents, music, and other personal files will be kept. Installed software will be kept where possible. System-wide settings will be cleared.</span> + True + True + + + 0 + 1 + 1 + 1 + + + + + Upgrade Ubuntu to 11.10 + True + False + 9 + 0 + True + + + + 0 + 0 + 1 + 1 + + + + + False + 24 + 0 + 0 + <span size="small"><span foreground="darkred">Warning:</span> This will delete all your Ubuntu 11.04 programs, documents, photos, music, and any other files.</span> + True + True + + + 0 + 3 + 1 + 1 + + + + + Erase Ubuntu and reinstall + True + False + 9 + 0 + True + reuse_partition + + + + 0 + 2 + 1 + 1 + + + + + True + False + 24 + 0 + 0 + <span size="small">Documents, music, and other personal files will be kept. You can choose which operating system you want each time the computer starts up.</span> + True + True + + + 0 + 5 + 1 + 1 + + + + + Install Ubuntu alongside Windows + True + True + False + 9 + 0 + 0 + True + True + reuse_partition + + + + 0 + 4 + 1 + 1 + + + + + True + False + 24 + 0 + 0 + <span size="small"><span foreground="darkred">Warning:</span> This will delete all of your Windows programs, documents, photos, music, and any other files.</span> + True + True + + + 0 + 7 + 1 + 1 + + + + + Replace Windows with Ubuntu + True + True + False + 9 + 0 + True + True + reuse_partition + + + + 0 + 6 + 1 + 1 + + + + + True + False + 48 + 0 + 0 + <span size="small">You’ll choose a security key in the next step.</span> + True + True + + + 0 + 9 + 1 + 1 + + + + + Encrypt the new Ubuntu installation for security + True + True + True + 24 + False + 9 + 0 + True + + + + 0 + 8 + 1 + 1 + + + + + True + False + 48 + 0 + 0 + <span size="small">This will set up Logical Volume Management. It allows taking snapshots and easier partition resizing.</span> + True + True + + + 0 + 11 + 1 + 1 + + + + + Use LVM with the new Ubuntu installation + True + True + True + 24 + False + 9 + 0 + True + + + + 0 + 10 + 1 + 1 + + + + + + False + False + 24 + 0 + 0 + <span foreground="darkred">Warning:</span> This will delete all your files on all operating systems. +This is experimental and may cause data loss. Do not use on production systems. + True + True + + + 0 + 14 + 1 + 1 + + + + + EXPERIMENTAL: Erase disk and use ZFS + False + True + False + 9 + 0 + True + True + reuse_partition + + + + 0 + 13 + 1 + 1 + + + + + + False + False + 24 + 0 + 0 + <span size="small">You can create or resize partitions yourself, or choose multiple partitions for Ubuntu.</span> + True + True + + + 0 + 16 + 1 + 1 + + + + + Something else + True + True + False + 9 + 0 + True + True + reuse_partition + + + + 0 + 15 + 1 + 1 + + + + + + + 0 + 1 + 1 + 1 + + + + + + + True + False + 20 + 20 + 20 + 20 + + + True + False + True + vertical + + + True + False + start + 6 + 6 + This computer uses Windows BitLocker encryption. You need to turn off BitLocker in Windows before installing Trisquel. For instructions, open this page on a phone or other device: <a href="https://help.ubuntu.com/bitlocker">help.ubuntu.com/bitlocker</a> + True + 100 + True + 0 + + + False + True + 0 + + + + + False + False + 0 + 6 + ../pixmaps/qr-help-ubuntu-com-bitlocker.png + + + False + True + 1 + + + + + + diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity index 4508fe3..697f3f4 100644 --- a/helpers/make-ubiquity +++ b/helpers/make-ubiquity @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2011-2022 Ruben Rodriguez +# Copyright (C) 2011-2023 Ruben Rodriguez # Copyright (C) 2019 Mason Hock # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=31 +VERSION=32 . ./config @@ -28,6 +28,10 @@ VERSION=31 # Fix some gtk labels for Orca patch -p1 < $DATA/a11y.patch +# Revert changes to advanced features page +cp $DATA/stepPartAsk.ui gui/gtk/stepPartAsk.ui +sed '/# Advanced features in new installs/,/^$/d' -i ubiquity/plugins/ubi-partman.py + # Do not try to start orca on ubiquity-dm sed 's/osextras.find_on_path.*orca.*/False: # Disabled by trisquel changes/' -i bin/ubiquity-dm @@ -220,6 +224,7 @@ replace archive.ubuntu.com/ubuntu archive.trisquel.org/trisquel . replace security.ubuntu.com/trisquel archive.trisquel.org/trisquel . replace archive.ubuntu.com archive.trisquel.org . replace security.ubuntu.com archive.trisquel.org . +replace help.ubuntu.com/bitlocker trisquel.info/en/wiki/bitlocker . #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 '82s/True/False/g' gui/gtk/stepPrepare.ui