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
1=== modified file '.pc/applied-patches'
2--- .pc/applied-patches 2015-03-12 09:13:06 +0000
3+++ .pc/applied-patches 2015-07-27 10:26:22 +0000
4@@ -17,3 +17,4 @@
5 26-systemd-server-before-client.patch
6 27-systemd-enable-with-systemctl-statd.patch
7 90-gss-free-lucid-sec-context.patch
8+systemd-server-dependency.patch
9
10=== added directory '.pc/systemd-server-dependency.patch'
11=== added file '.pc/systemd-server-dependency.patch/.timestamp'
12=== added directory '.pc/systemd-server-dependency.patch/systemd'
13=== added file '.pc/systemd-server-dependency.patch/systemd/nfs-server.service'
14--- .pc/systemd-server-dependency.patch/systemd/nfs-server.service 1970-01-01 00:00:00 +0000
15+++ .pc/systemd-server-dependency.patch/systemd/nfs-server.service 2015-07-27 10:26:22 +0000
16@@ -0,0 +1,37 @@
17+[Unit]
18+Description=NFS server and services
19+DefaultDependencies=no
20+Requires= network.target proc-fs-nfsd.mount rpcbind.target
21+Requires= nfs-mountd.service
22+Wants=nfs-idmapd.service
23+
24+After= local-fs.target
25+After= network.target proc-fs-nfsd.mount rpcbind.target nfs-mountd.service
26+After= nfs-idmapd.service rpc-statd.service
27+Before= rpc-statd-notify.service
28+
29+# GSS services dependencies and ordering
30+Wants=auth-rpcgss-module.service
31+After=rpc-gssd.service gssproxy.service rpc-svcgssd.service
32+
33+# start/stop server before/after client
34+Before=remote-fs-pre.target
35+
36+Wants=nfs-config.service
37+After=nfs-config.service
38+
39+[Service]
40+EnvironmentFile=-/run/sysconfig/nfs-utils
41+
42+Type=oneshot
43+RemainAfterExit=yes
44+ExecStartPre=/usr/sbin/exportfs -r
45+ExecStart=/usr/sbin/rpc.nfsd $RPCNFSDARGS
46+ExecStop=/usr/sbin/rpc.nfsd 0
47+ExecStopPost=/usr/sbin/exportfs -au
48+ExecStopPost=/usr/sbin/exportfs -f
49+
50+ExecReload=/usr/sbin/exportfs -r
51+
52+[Install]
53+WantedBy=multi-user.target
54
55=== modified file 'debian/changelog'
56--- debian/changelog 2015-07-27 10:37:24 +0000
57+++ debian/changelog 2015-07-27 10:26:22 +0000
58@@ -1,3 +1,4 @@
59+<<<<<<< TREE
60 nfs-utils (1:1.2.8-9ubuntu9) wily; urgency=medium
61
62 * Drop versioned mountall dependency. Trusty's is already newer and we don't
63@@ -5,6 +6,15 @@
64
65 -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 27 Jul 2015 10:37:24 +0200
66
67+=======
68+nfs-utils (1:1.2.8-9ubuntu8.2) vivid; urgency=medium
69+
70+ * debian/patches/systemd-server-dependency.patch: depend on network-
71+ online.target, not network.target. Closes LP: #1452644.
72+
73+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 07 May 2015 10:17:55 -0700
74+
75+>>>>>>> MERGE-SOURCE
76 nfs-utils (1:1.2.8-9ubuntu8.1) vivid; urgency=medium
77
78 * Add a dependency on keyutils to nfs-common, so that idmapping will work
79
80=== modified file 'debian/patches/series'
81--- debian/patches/series 2015-03-12 09:13:06 +0000
82+++ debian/patches/series 2015-07-27 10:26:22 +0000
83@@ -17,3 +17,4 @@
84 26-systemd-server-before-client.patch
85 27-systemd-enable-with-systemctl-statd.patch
86 90-gss-free-lucid-sec-context.patch
87+systemd-server-dependency.patch
88
89=== added file 'debian/patches/systemd-server-dependency.patch'
90--- debian/patches/systemd-server-dependency.patch 1970-01-01 00:00:00 +0000
91+++ debian/patches/systemd-server-dependency.patch 2015-07-27 10:26:22 +0000
92@@ -0,0 +1,22 @@
93+Description: depend on network-online.target, not network.target
94+ network.target is a "passive" unit in systemd, services are not supposed
95+ to depend on it but only to declare ordering requirements relative to it.
96+ This wrong dependency causes a dependency loop which systemd has to break,
97+ with wrong results.
98+ The right target to depend on is always 'network-online.target'.
99+Author: Steve Langasek <steve.langasek@ubuntu.com>
100+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1452644
101+
102+Index: trunk/systemd/nfs-server.service
103+===================================================================
104+--- trunk.orig/systemd/nfs-server.service
105++++ trunk/systemd/nfs-server.service
106+@@ -1,7 +1,7 @@
107+ [Unit]
108+ Description=NFS server and services
109+ DefaultDependencies=no
110+-Requires= network.target proc-fs-nfsd.mount rpcbind.target
111++Requires= network-online.target proc-fs-nfsd.mount rpcbind.target
112+ Requires= nfs-mountd.service
113+ Wants=nfs-idmapd.service
114+
115
116=== modified file 'systemd/nfs-server.service'
117--- systemd/nfs-server.service 2015-03-12 09:13:06 +0000
118+++ systemd/nfs-server.service 2015-07-27 10:26:22 +0000
119@@ -1,7 +1,7 @@
120 [Unit]
121 Description=NFS server and services
122 DefaultDependencies=no
123-Requires= network.target proc-fs-nfsd.mount rpcbind.target
124+Requires= network-online.target proc-fs-nfsd.mount rpcbind.target
125 Requires= nfs-mountd.service
126 Wants=nfs-idmapd.service
127

Subscribers

People subscribed via source and target branches

to all changes: