| commit | 8135c9d705a493324b5aa86dcedf481f3debce0e | [log] [tgz] |
|---|---|---|
| author | Rafael Castillo <rafaelcl@google.com> | Fri May 31 18:52:48 2024 +0000 |
| committer | Rafael Castillo <rafaelcl@google.com> | Thu Jul 11 13:59:36 2024 +0000 |
| tree | a4330f424fc184520c2a44734178a28dce689636 | |
| parent | defc4100113ba91ff0edc13c1fe867aac5a493b7 [diff] |
Remove conflicting ordering clause from multipathd unit file I45d6abee6691fe57ea5fcc82eccac878c49f23a6 introduced an ordering clause that conflicts with the existing Before=local-fs-pre.target. This change updates the patch from that CL to remove the ordering conflict. Change-Id: I55fbb6a701af34b06ebef834230072420d2860a2 Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/73013 Reviewed-by: Tara Gu <tarag@google.com> Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/project-edgeos/sys-fs/multipath-tools/files/multipath-tools-0.9.7-after-etc-overlay-mount.patch b/project-edgeos/sys-fs/multipath-tools/files/multipath-tools-0.9.7-after-etc-overlay-mount.patch index 4306bcf..83713a8 100644 --- a/project-edgeos/sys-fs/multipath-tools/files/multipath-tools-0.9.7-after-etc-overlay-mount.patch +++ b/project-edgeos/sys-fs/multipath-tools/files/multipath-tools-0.9.7-after-etc-overlay-mount.patch
@@ -1,8 +1,13 @@ diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in -index 6d03ff71..797ea7a5 100644 +index 6d03ff7..374d2aa 100644 --- a/multipathd/multipathd.service.in +++ b/multipathd/multipathd.service.in -@@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target +@@ -1,10 +1,11 @@ + [Unit] + Description=Device-Mapper Multipath Device Controller + Before=lvm2-activation-early.service +-Before=local-fs-pre.target blk-availability.service shutdown.target ++Before=blk-availability.service shutdown.target Wants=systemd-udevd-kernel.socket @MODPROBE_UNIT@ After=systemd-udevd-kernel.socket @MODPROBE_UNIT@ After=multipathd.socket systemd-remount-fs.service
diff --git a/project-edgeos/sys-fs/multipath-tools/multipath-tools-0.9.7-r2.ebuild b/project-edgeos/sys-fs/multipath-tools/multipath-tools-0.9.7-r3.ebuild similarity index 100% rename from project-edgeos/sys-fs/multipath-tools/multipath-tools-0.9.7-r2.ebuild rename to project-edgeos/sys-fs/multipath-tools/multipath-tools-0.9.7-r3.ebuild