Merge ~ahasenack/ubuntu/+source/landscape-client:remove-landscape-link-1753936 into ubuntu/+source/landscape-client:ubuntu/devel

Proposed by Andreas Hasenack
Status: Merged
Merge reported by: Andreas Hasenack
Merged at revision: 7eb6801e0c6093b35017c803b8318c9664f4b806
Proposed branch: ~ahasenack/ubuntu/+source/landscape-client:remove-landscape-link-1753936
Merge into: ubuntu/+source/landscape-client:ubuntu/devel
Diff against target: 208 lines (+188/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/remove-landscape-link.patch (+180/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  (community) Approve
Canonical Server Pending
Review via email: mp+341208@code.staging.launchpad.net

Description of the change

Remove the LandscapeLink plugin from the list of default plugins. Unless the user has for some reason explicitly enabled the plugin in /etc/landscape/client.conf, this removes the https://landscape.canonical.com link from the landscape-sysinfo output.

Testing instructions

- sudo apt install landscape-common
- landscape-sysinfo
- note the landscape link in the output
- sudo add-apt-repository -y -u ppa:ahasenack/landscape-client-motd-link-1753936
- sudo apt install landscape-common
- landscape-sysinfo
- notice that the landscape link is gone

Sample output:

Before:
ubuntu@bionic-landscape-client-motd:~$ landscape-sysinfo
  System load: 0.66 Processes: 21
  Usage of /home: unknown Users logged in: 1
  Memory usage: 0% IP address for eth0: 10.0.100.66
  Swap usage: 0%

  Graph this data and manage this system at:
    https://landscape.canonical.com/

After:
ubuntu@bionic-landscape-client-motd:~$ landscape-sysinfo
  System load: 0.55 Processes: 21
  Usage of /home: unknown Users logged in: 1
  Memory usage: 0% IP address for eth0: 10.0.100.66
  Swap usage: 0%

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

LGTM +1
Tests good, diff seems fine

review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

As discussed upload tag pushed.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

@Andreas - did you upload last week, if so set merged?
Otherwise if modified please remember that tags are pushed as discussed and stated here.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches