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

Updated ubiquity helper

Browse source
This commit is contained in:
Rubén Rodríguez 2014-05-21 02:58:22 +02:00
parent c12990290c
commit 8b4cd97dc0
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
helpers/make-ubiquity
View file

@ -17,7 +17,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=1 VERSION=2
. ./config . ./config
@ -43,7 +43,7 @@ done
echo "d-i/source/apt-setup/generators/99trisquel usr/lib/ubiquity/apt-setup/generators" >> debian/ubiquity.install-any echo "d-i/source/apt-setup/generators/99trisquel usr/lib/ubiquity/apt-setup/generators" >> debian/ubiquity.install-any
#change icon #change icon
cp $DATA/trisquel.png desktop/ubiquity.png cp $DATA/trisquel.png data/ubiquity.png
# remove Ubuntu apt setup for the installer # remove Ubuntu apt setup for the installer
find d-i/source/apt-setup/generators -type f | grep -v 01setup | xargs -r rm find d-i/source/apt-setup/generators -type f | grep -v 01setup | xargs -r rm
@ -122,9 +122,11 @@ done
cat << EOF1 >> scripts/apt-setup cat << EOF1 >> scripts/apt-setup
#Trisquel hack to regenerate ssl keys after installation #Trisquel hack to regenerate ssl keys after installation
rm -f /target/etc/ssh/ssh_host_* if [ -f /target/etc/ssh/ssh_host_rsa_key ]; then
ssh-keygen -q -f /target/etc/ssh/ssh_host_rsa_key -N '' -t rsa rm -f /target/etc/ssh/ssh_host_*
ssh-keygen -q -f /target/etc/ssh/ssh_host_dsa_key -N '' -t dsa ssh-keygen -q -f /target/etc/ssh/ssh_host_rsa_key -N '' -t rsa
ssh-keygen -q -f /target/etc/ssh/ssh_host_dsa_key -N '' -t dsa
fi
if [ -d /etc/italc ] if [ -d /etc/italc ]
then then
rm -rf /etc/italc/* rm -rf /etc/italc/*
@ -138,17 +140,17 @@ 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 #cat << EOF > /target/etc/grub.d/01_PASSWORD
#! /bin/sh -e #! /bin/sh -e
# Trisquel enables a random password to grub during install # Trisquel enables a random password to grub during install
# Comment this file to remove the password. # Comment this file to remove the password.
# This file should only be readable by root. # This file should only be readable by root.
echo set superusers=grub #echo set superusers=grub
echo password grub \$(bash -c 'echo \$RANDOM') #echo password grub \$(bash -c 'echo \$RANDOM')
EOF #EOF
chmod 700 /target/etc/grub.d/01_PASSWORD #chmod 700 /target/etc/grub.d/01_PASSWORD
# Hacks for accessibility # Hacks for accessibility
if pgrep orca > /dev/null if pgrep orca > /dev/null
@ -175,9 +177,12 @@ fi
EOF1 EOF1
sed 's/Trisquel/Trsql/' -i ubiquity/plugins/ubi-partman.py
sed 's/Trisquel-Battersea/Ubuntu-Battersea/' -i tests/test_gtkwidgets.py
changelog "Adapted for Trisquel" changelog "Adapted for Trisquel"
rm -rf debian/source rm -rf debian/source
compile PARALLEL=false compile