summaryrefslogtreecommitdiff
diff options
authorMichael Vogt <mvo@ubuntu.com>2018-11-14 16:31:59 +0100
committerMichael Vogt <mvo@ubuntu.com>2018-11-14 16:31:59 +0100
commit71b219f9adda72582db4add4e638c7738af0db33 (patch)
treea95a6cd6da9ee87b5f6d2140c91353bcf63a1dda
parentb6b1626840c966aab8bd0560e0b1d06da01632cf (diff)
ifacestate: rename setupPhasedSecurity -> setupSecurityByBackendfix/lp-1802581-2
-rw-r--r--overlord/ifacestate/handlers.go2
-rw-r--r--overlord/ifacestate/helpers.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/overlord/ifacestate/handlers.go b/overlord/ifacestate/handlers.go
index 52ddf142d2..b953ab100d 100644
--- a/overlord/ifacestate/handlers.go
+++ b/overlord/ifacestate/handlers.go
@@ -193,7 +193,7 @@ func (m *InterfaceManager) setupProfilesForSnap(task *state.Task, _ *tomb.Tomb,
affectedSnaps = append(affectedSnaps, snapInfo)
confinementOpts = append(confinementOpts, confinementOptions(snapst.Flags))
}
- return m.setupPhasedSecurity(task, affectedSnaps, confinementOpts)
+ return m.setupSecurityByBackend(task, affectedSnaps, confinementOpts)
}
func (m *InterfaceManager) doRemoveProfiles(task *state.Task, tomb *tomb.Tomb) error {
diff --git a/overlord/ifacestate/helpers.go b/overlord/ifacestate/helpers.go
index 6004889279..27f0792fa4 100644
--- a/overlord/ifacestate/helpers.go
+++ b/overlord/ifacestate/helpers.go
@@ -310,7 +310,7 @@ func (m *InterfaceManager) reloadConnections(snapName string) ([]string, error)
return result, nil
}
-func (m *InterfaceManager) setupPhasedSecurity(task *state.Task, snaps []*snap.Info, opts []interfaces.ConfinementOptions) error {
+func (m *InterfaceManager) setupSecurityByBackend(task *state.Task, snaps []*snap.Info, opts []interfaces.ConfinementOptions) error {
st := task.State()
// Setup all affected snaps, start with the most important security