Fixes to ubuntu-release-upgrader
This commit is contained in:
parent
c4ebc86a06
commit
3e7348be87
5 changed files with 99 additions and 9 deletions
|
|
@ -24,7 +24,7 @@
|
|||
# Also, don't forget to update the meta-release files at archive and packages.t.i
|
||||
# The "obsoletes" list from ubuntu has been removed
|
||||
|
||||
VERSION=6
|
||||
VERSION=7
|
||||
|
||||
. ./config
|
||||
|
||||
|
|
@ -36,6 +36,9 @@ sed '/_add_extras_repository/,/adding extras.ubuntu.com/d' -i DistUpgrade/DistUp
|
|||
sed 's/01ubuntu/01backports/' -i DistUpgrade/DistUpgradeController.py
|
||||
rm tests/test-data/xorg.conf.fglrx
|
||||
|
||||
# Fix mirror checker
|
||||
sed '/security.ubuntu.com" in entry.uri or/d' -i DistUpgrade/DistUpgradeController.py
|
||||
|
||||
#https://bugs.launchpad.net/ubuntu/+source/python-defaults/+bug/990740
|
||||
cat << EOF >> DistUpgrade/DistUpgradeQuirks.py
|
||||
|
||||
|
|
@ -228,9 +231,6 @@ https://ftp.yzu.edu.tw/Linux/trisquel.packages/
|
|||
https://mirrors.ocf.berkeley.edu/trisquel/
|
||||
EOF
|
||||
|
||||
rm data/DistUpgrade.cfg*
|
||||
cp $DATA/DistUpgrade.cfg* data/
|
||||
|
||||
cat << EOF1 > DistUpgrade/trisquel-postinstall.sh
|
||||
#!/bin/sh
|
||||
|
||||
|
|
@ -279,6 +279,9 @@ rpl trusty belenos . -R
|
|||
rpl xenial flidas . -R
|
||||
rpl bionic etiona . -R
|
||||
|
||||
rm data/DistUpgrade.cfg*
|
||||
cp $DATA/DistUpgrade.cfg* data/
|
||||
|
||||
rm ./data/demoted.cfg ./DistUpgrade/demoted.cfg.trusty utils/demoted.cfg.trusty data/demoted.cfg.trusty
|
||||
echo "notification-daemon" > data/demoted.cfg
|
||||
echo "notification-daemon" $DATA/demoted utils/demoted.cfg
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue