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

ubiquity: enabled encryption by default, disabled grub password hack

Browse source
This commit is contained in:
Ruben Rodriguez 2017-06-18 16:47:33 -04:00
parent 6686d58dab
commit b69c7dc632
2 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
helpers/DATA/ubiquity/encrypt_by_default.patch Normal file
View file

@ -0,0 +1,12 @@
diff -ru source.bak/ubiquity/plugins/ubi-partman.py source/ubiquity/plugins/ubi-partman.py
--- source.bak/ubiquity/plugins/ubi-partman.py 2017-06-18 00:20:17.662208590 -0400
+++ source/ubiquity/plugins/ubi-partman.py 2017-06-18 15:35:21.718202038 -0400
@@ -658,6 +658,8 @@
opt_desc.show()
opt_widget.set_label(options[option].title)
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)
ticked = True

22
helpers/make-ubiquity
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2011-2016 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2011-2017 Ruben Rodriguez <ruben@trisquel.info>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -17,10 +17,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=3 VERSION=4
. ./config . ./config
patch -p1 < $DATA/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
replace ubuntu_installed trisquel_installed . replace ubuntu_installed trisquel_installed .
@ -220,22 +222,6 @@ then
chown root:admin /target/etc/italc/keys/private/*/key chown root:admin /target/etc/italc/keys/private/*/key
fi fi
cat << EOF > /target/etc/grub.d/01_PASSWORD
#! /bin/sh -e
# As a security measure Trisquel sets a password for GRUB during install.
# It prevents unauthorized users from gaining root through the boot manager.
# You can still edit GRUB entries by entering "grub" as user and the password
# set below in this file. This file should only be readable by root.
#
# To disable the password, Comment or remove this file and run this command:
# sudo update-grub2
echo set superusers=grub
echo password grub \$(bash -c 'echo \$RANDOM')
EOF
chmod 700 /target/etc/grub.d/01_PASSWORD
# Hacks for accessibility # Hacks for accessibility
if pgrep orca > /dev/null if pgrep orca > /dev/null
then then