Skip to content

Commit

Permalink
nanny: Make FSM and worker writeable
Browse files Browse the repository at this point in the history
  • Loading branch information
wipawel committed Jun 6, 2014
1 parent 54ef301 commit c090a36
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
4 changes: 0 additions & 4 deletions nanny/device.c
Expand Up @@ -220,10 +220,6 @@ ni_managed_device_apply_policy(ni_managed_device_t *mdev, ni_managed_policy_t *m

ni_debug_nanny("%s: using policy %s", w->name, ni_fsm_policy_name(policy));

/* Set FSM and current ifworker as writable, nanny can update wickedd structures */
w->readonly = FALSE;
fsm->readonly = FALSE;

/* This returns "modem" or "interface" */
type_name = ni_ifworker_type_to_string(w->type);

Expand Down
8 changes: 0 additions & 8 deletions nanny/main.c
Expand Up @@ -210,11 +210,6 @@ babysit(void)
ni_nanny_start(mgr);
fsm = mgr->fsm;

/* Nanny should not update neither <client-info> nor <client-state>,
* unless it is told to configure a device by 'wicked enable'.
*/
fsm->readonly = TRUE;

if (!opt_foreground) {
ni_daemon_close_t close_flags = NI_DAEMON_CLOSE_STD;

Expand All @@ -237,9 +232,6 @@ babysit(void)

ni_fsm_do(mgr->fsm, &timeout);

/* Set back the FSM to readonly after job is done */
fsm->readonly = TRUE;

if (ni_socket_wait(timeout) != 0)
ni_fatal("ni_socket_wait failed");
}
Expand Down

0 comments on commit c090a36

Please sign in to comment.