Ubuntu
nfs-utils package

Merge lp:~ubuntu-branches/ubuntu/wily/nfs-utils/wily-201507271018 into lp:ubuntu/wily/nfs-utils

  1. Wily (15.10)
  2. wily-201507271018
  3. Merge into wily
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/wily/nfs-utils/wily-201507271018
Merge into: lp:ubuntu/wily/nfs-utils
Diff against target: 126 lines (+72/-1) (has conflicts)
6 files modified
.pc/applied-patches (+1/-0)
.pc/systemd-server-dependency.patch/systemd/nfs-server.service (+37/-0)
debian/changelog (+10/-0)
debian/patches/series (+1/-0)
debian/patches/systemd-server-dependency.patch (+22/-0)
systemd/nfs-server.service (+1/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/wily/nfs-utils/wily-201507271018
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+265946@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/wily/nfs-utils reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/wily/nfs-utils/wily-201507271018. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

99. By Steve Langasek

releasing package nfs-utils version 1:1.2.8-9ubuntu8.2

98. By Steve Langasek

debian/patches/systemd-server-dependency.patch: depend on network-
online.target, not network.target. Closes LP: #1452644.

97. By Steve Langasek

releasing package nfs-utils version 1:1.2.8-9ubuntu8.1

96. By Steve Langasek

Add a dependency on keyutils to nfs-common, so that idmapping will work
under systemd. LP: #1449074.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.pc/applied-patches'
--- .pc/applied-patches 2015-03-12 09:13:06 +0000
+++ .pc/applied-patches 2015-07-27 10:26:22 +0000
@@ -17,3 +17,4 @@
1726-systemd-server-before-client.patch1726-systemd-server-before-client.patch
1827-systemd-enable-with-systemctl-statd.patch1827-systemd-enable-with-systemctl-statd.patch
1990-gss-free-lucid-sec-context.patch1990-gss-free-lucid-sec-context.patch
20systemd-server-dependency.patch
2021
=== added directory '.pc/systemd-server-dependency.patch'
=== added file '.pc/systemd-server-dependency.patch/.timestamp'
=== added directory '.pc/systemd-server-dependency.patch/systemd'
=== added file '.pc/systemd-server-dependency.patch/systemd/nfs-server.service'
--- .pc/systemd-server-dependency.patch/systemd/nfs-server.service 1970-01-01 00:00:00 +0000
+++ .pc/systemd-server-dependency.patch/systemd/nfs-server.service 2015-07-27 10:26:22 +0000
@@ -0,0 +1,37 @@
1[Unit]
2Description=NFS server and services
3DefaultDependencies=no
4Requires= network.target proc-fs-nfsd.mount rpcbind.target
5Requires= nfs-mountd.service
6Wants=nfs-idmapd.service
7
8After= local-fs.target
9After= network.target proc-fs-nfsd.mount rpcbind.target nfs-mountd.service
10After= nfs-idmapd.service rpc-statd.service
11Before= rpc-statd-notify.service
12
13# GSS services dependencies and ordering
14Wants=auth-rpcgss-module.service
15After=rpc-gssd.service gssproxy.service rpc-svcgssd.service
16
17# start/stop server before/after client
18Before=remote-fs-pre.target
19
20Wants=nfs-config.service
21After=nfs-config.service
22
23[Service]
24EnvironmentFile=-/run/sysconfig/nfs-utils
25
26Type=oneshot
27RemainAfterExit=yes
28ExecStartPre=/usr/sbin/exportfs -r
29ExecStart=/usr/sbin/rpc.nfsd $RPCNFSDARGS
30ExecStop=/usr/sbin/rpc.nfsd 0
31ExecStopPost=/usr/sbin/exportfs -au
32ExecStopPost=/usr/sbin/exportfs -f
33
34ExecReload=/usr/sbin/exportfs -r
35
36[Install]
37WantedBy=multi-user.target
038
=== modified file 'debian/changelog'
--- debian/changelog 2015-07-27 10:37:24 +0000
+++ debian/changelog 2015-07-27 10:26:22 +0000
@@ -1,3 +1,4 @@
1<<<<<<< TREE
1nfs-utils (1:1.2.8-9ubuntu9) wily; urgency=medium2nfs-utils (1:1.2.8-9ubuntu9) wily; urgency=medium
23
3 * Drop versioned mountall dependency. Trusty's is already newer and we don't4 * Drop versioned mountall dependency. Trusty's is already newer and we don't
@@ -5,6 +6,15 @@
56
6 -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 27 Jul 2015 10:37:24 +02007 -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 27 Jul 2015 10:37:24 +0200
78
9=======
10nfs-utils (1:1.2.8-9ubuntu8.2) vivid; urgency=medium
11
12 * debian/patches/systemd-server-dependency.patch: depend on network-
13 online.target, not network.target. Closes LP: #1452644.
14
15 -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 07 May 2015 10:17:55 -0700
16
17>>>>>>> MERGE-SOURCE
8nfs-utils (1:1.2.8-9ubuntu8.1) vivid; urgency=medium18nfs-utils (1:1.2.8-9ubuntu8.1) vivid; urgency=medium
919
10 * Add a dependency on keyutils to nfs-common, so that idmapping will work20 * Add a dependency on keyutils to nfs-common, so that idmapping will work
1121
=== modified file 'debian/patches/series'
--- debian/patches/series 2015-03-12 09:13:06 +0000
+++ debian/patches/series 2015-07-27 10:26:22 +0000
@@ -17,3 +17,4 @@
1726-systemd-server-before-client.patch1726-systemd-server-before-client.patch
1827-systemd-enable-with-systemctl-statd.patch1827-systemd-enable-with-systemctl-statd.patch
1990-gss-free-lucid-sec-context.patch1990-gss-free-lucid-sec-context.patch
20systemd-server-dependency.patch
2021
=== added file 'debian/patches/systemd-server-dependency.patch'
--- debian/patches/systemd-server-dependency.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/systemd-server-dependency.patch 2015-07-27 10:26:22 +0000
@@ -0,0 +1,22 @@
1Description: depend on network-online.target, not network.target
2 network.target is a "passive" unit in systemd, services are not supposed
3 to depend on it but only to declare ordering requirements relative to it.
4 This wrong dependency causes a dependency loop which systemd has to break,
5 with wrong results.
6 The right target to depend on is always 'network-online.target'.
7Author: Steve Langasek <steve.langasek@ubuntu.com>
8Bug-Ubuntu: https://bugs.launchpad.net/bugs/1452644
9
10Index: trunk/systemd/nfs-server.service
11===================================================================
12--- trunk.orig/systemd/nfs-server.service
13+++ trunk/systemd/nfs-server.service
14@@ -1,7 +1,7 @@
15 [Unit]
16 Description=NFS server and services
17 DefaultDependencies=no
18-Requires= network.target proc-fs-nfsd.mount rpcbind.target
19+Requires= network-online.target proc-fs-nfsd.mount rpcbind.target
20 Requires= nfs-mountd.service
21 Wants=nfs-idmapd.service
22
023
=== modified file 'systemd/nfs-server.service'
--- systemd/nfs-server.service 2015-03-12 09:13:06 +0000
+++ systemd/nfs-server.service 2015-07-27 10:26:22 +0000
@@ -1,7 +1,7 @@
1[Unit]1[Unit]
2Description=NFS server and services2Description=NFS server and services
3DefaultDependencies=no3DefaultDependencies=no
4Requires= network.target proc-fs-nfsd.mount rpcbind.target4Requires= network-online.target proc-fs-nfsd.mount rpcbind.target
5Requires= nfs-mountd.service5Requires= nfs-mountd.service
6Wants=nfs-idmapd.service6Wants=nfs-idmapd.service
77

Subscribers

People subscribed via source and target branches

to all changes: