Updated make-ubuntu-release-upgrader for flidas-etiona upgrade

helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg

@@ -1,9 +1,9 @@
 [View]
 # the views will be tried in this order, if one fails to import, the next
 # is tried
-View=DistUpgradeViewGtk3,DistUpgradeViewGtk,DistUpgradeViewKDE,DistUpgradeViewText
+View=DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
 #View=DistUpgradeViewNonInteractive
-#Depends= python-apt (>= 0.6.0), apt (>= 0.6)
+#Depends= apt (>= 1.0.10.2ubuntu2)
 # the views below support upgrades over ssh connection
 SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
 
@@ -13,54 +13,61 @@ SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
 MetaPkgs=trisquel-recommended, trisquel-mini-recommended, triskel-recommended, trisquel-sugar-recommended
 BaseMetaPkgs=trisquel-minimal, trisquel-base-recommended
 Demotions=demoted.cfg
-RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
+#RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
 RemovalBlacklistFile=removal_blacklist.cfg
 # if those packages were installed, make sure to keep them installed
-KeepInstalledPkgs=gnumeric, hpijs, xserver-xorg-video-all
+KeepInstalledPkgs=xserver-xorg-video-all
 KeepInstalledSection=translations
 RemoveObsoletes=yes
-ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools, gnome-session-flashback
+PurgeObsoletes=yes
-# hints for for stuff that should be done early
+#ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
-PostUpgradePurge=ltsp-client, ltspfsd
+# hints for for stuff that should be done right after the cache calculated
-PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp, kdm, xsettings-kde
+# the dist-upgrade (not to be confused with the PostUpgrade hooks in the
-PostUpgradeUpgrade=brasero,edubuntu-desktop
+# quirks handling)
+#PostUpgradePurge=linux-restricted-modules-common
+#PostUpgradeRemove=xsettings-kde
+#PostUpgradeUpgrade=brasero,edubuntu-desktop
 #PostUpgradeInstall=apt
 PostInstallScripts=./trisquel-postinstall.sh
 EnableApport=yes
 # this supported blacklisting certain versions to ensure we do not upgrade
 #  - blcr-dkms fails to build on kernel 2.6.35
-BadVersions=blcr-dkms_0.8.2-13
+#BadVersions=blcr-dkms_0.8.2-13
 # ubiquity slideshow
 #SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
 
 [KernelRemoval]
-Version=3.2.0
+Version=4.2.0
-BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm
+BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,
-Types=386,ec2,generic,rt,server,virtual
+  linux-header-lbm,linux-signed-image,linux-tools,linux-cloud-tools,
+  linux-image-extra
+Types=386,ec2,generic,generic-lpae,lowlatency,powerpc-e500mc,powerpc-smp,
+  powerpc64-emb,powerpc64-smp,rt,server,virtual
 
 # information about the individual meta-pkgs
 [trisquel]
-KeyDependencies=trisquel-desktop-common-data, unity-greeter
+KeyDependencies=trisquel-desktop-common-data, unity-greeter, lightdm
 # those pkgs will be marked remove right after the distUpgrade in the cache
 PostUpgradeRemove=casper, xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner, compiz-core, gdm, gnome-ppp, gwibber, remmina-common
-ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, notification-daemon, trisquel-session, libcogl15, libcogl-pango15
+ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, notification-daemon, trisquel-session, libcogl15, libcogl-pango15, gnome-app-install
 
 [trisquel-mini]
 KeyDependencies=trisquel-mini-data unity-greeter
 #Remove previous gnome component from ltrisquel to avoid pulling gnome depends on upgrade (LP: #945215)
 PostUpgradeRemove=casper, gnome-bluetooth, gnome-power-manager
+ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, notification-daemon, trisquel-session, libcogl15, libcogl-pango15, gnome-app-install
 
 [Files]
 BackupExt=distUpgrade
 LogDir=/var/log/dist-upgrade/
 
 [Sources]
-From=belenos
+From=flidas
-To=flidas
+To=etiona
 ValidOrigin=Trisquel
 ValidMirrors = mirrors.cfg
 Components=main
-Pockets=security,updates,backports
+Pockets=security,updates,proposed,backports
 ;AllowThirdParty=False
 
 ;[PreRequists]
@@ -69,17 +76,6 @@ Pockets=security,updates,backports
 ;SourcesList-ia64=prerequists-sources.ports.list
 ;SourcesList-hppa=prerequists-sources.ports.list
 
-[Aufs]
-; this is a xor option, either full or chroot overlay
-;EnableFullOverlay=yes
-;EnableChrootOverlay=yes
-; sync changes from the chroot back to the real system
-;EnableChrootRsync=yes
-; what chroot dir to use
-;ChrootDir=/tmp/upgrade-chroot
-; the RW dir to use (either for full overlay or chroot overlay)
-;RWDir=/tmp/upgrade-rw
-
 [Network]
 MaxRetries=3
 

helpers/make-ubuntu-release-upgrader

@@ -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=4
+VERSION=5
 
 . ./config
 
@@ -234,21 +234,12 @@ cat << EOF1 > DistUpgrade/trisquel-postinstall.sh
 # Making sure this is gone
 apt-get remove --force-yes -y notification-daemon
 
-if ! [ -f /etc/grub.d/01_PASSWORD ]; then
+# Default to systemd-resolved
-cat << EOF > /etc/grub.d/01_PASSWORD
+if [ "\$(readlink /etc/resolv.conf)" != "/run/systemd/resolve/stub-resolv.conf" ]; then
-#! /bin/sh -e
+  mv /etc/resolv.conf /etc/resolv.conf.flidas.bak
-# Trisquel enables a random password to grub during install
+  ln -s /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
-# Comment this file to remove the password.
-# This file should only be readable by root.
-
-echo set superusers=grub
-echo password grub \$(bash -c 'echo \$RANDOM')
-EOF
 fi
 
-# Just in case
-update-initramfs -u
-update-grub
 EOF1
 chmod 755 DistUpgrade/trisquel-postinstall.sh