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

Fixes to make-ubuntu-release-upgrader

Browse source
This commit is contained in:
Ruben Rodriguez 2020-04-19 17:41:48 -04:00
parent 85af57e08c
commit a7c717c333
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
helpers/make-ubuntu-release-upgrader
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2008-2018 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2008-2020 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2014 Santiago Rodriguez <santi@trisquel.info> # Copyright (C) 2014 Santiago Rodriguez <santi@trisquel.info>
# Copyright (C) 2019 Mason Hock <mason@masonhock.com> # Copyright (C) 2019 Mason Hock <mason@masonhock.com>
# #
@ -24,7 +24,7 @@
# Also, don't forget to update the meta-release files at archive and packages.t.i # Also, don't forget to update the meta-release files at archive and packages.t.i
# The "obsoletes" list from ubuntu has been removed # The "obsoletes" list from ubuntu has been removed
VERSION=7 VERSION=8
. ./config . ./config
@ -234,22 +234,21 @@ EOF
cat << EOF1 > DistUpgrade/trisquel-postinstall.sh cat << EOF1 > DistUpgrade/trisquel-postinstall.sh
#!/bin/sh #!/bin/sh
# Making sure this is gone # Make sure these are gone
apt-get remove --force-yes -y notification-daemon export DEBIAN_FRONTEND=noninteractive
apt-get remove --force-yes -y notification-daemon resolvconf
# Default to systemd-resolved # Default to systemd-resolved
if [ "\$(readlink /etc/resolv.conf)" != "/run/systemd/resolve/stub-resolv.conf" ]; then if [ "\$(readlink /etc/resolv.conf)" != "/run/systemd/resolve/stub-resolv.conf" ]; then
mv /etc/resolv.conf /etc/resolv.conf.flidas.bak mv /etc/resolv.conf /etc/resolv.conf.flidas.bak
ln -s /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf ln -s /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
fi fi
EOF1 EOF1
chmod 755 DistUpgrade/trisquel-postinstall.sh chmod 755 DistUpgrade/trisquel-postinstall.sh
sed '/self._view.getTerminal/s|\[script\]|["/bin/sh",script]|' -i ./DistUpgrade/DistUpgradeController.py
replace changelogs.ubuntu.com packages.trisquel.info . replace changelogs.ubuntu.com packages.trisquel.info .
rpl 11\.04 5\.0 DistUpgrade/*.ui rpl 11\.04 5\.0 DistUpgrade/*.ui
rpl 11\.04 5\.0 po/* -R rpl 11\.04 5\.0 po/* -R
rpl 11\.10 5\.5 DistUpgrade/*.ui rpl 11\.10 5\.5 DistUpgrade/*.ui
@ -282,9 +281,12 @@ rpl bionic etiona . -R
rm data/DistUpgrade.cfg* rm data/DistUpgrade.cfg*
cp $DATA/DistUpgrade.cfg* data/ cp $DATA/DistUpgrade.cfg* data/
rm ./data/demoted.cfg ./DistUpgrade/demoted.cfg.trusty utils/demoted.cfg.trusty data/demoted.cfg.trusty cat << EOF >> data/demoted.cfg
echo "notification-daemon" > data/demoted.cfg notification-daemon
echo "notification-daemon" $DATA/demoted utils/demoted.cfg resolvconf
eom
EOF
cp data/demoted.cfg utils/demoted.cfg
sed 's|.ubuntu-bug ubuntu-release-upgrader-core. in a terminal|https://trisquel.info/en/project/issues in a browser.|' DistUpgrade/DistUpgradeCache.py -i sed 's|.ubuntu-bug ubuntu-release-upgrader-core. in a terminal|https://trisquel.info/en/project/issues in a browser.|' DistUpgrade/DistUpgradeCache.py -i
replace "https*://launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+filebug" "https://trisquel.info/project/issues" . replace "https*://launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+filebug" "https://trisquel.info/project/issues" .