← Back to branch summary

~xnox/ubuntu/quantal/lvm2/merge95

« back to all changes in this revision

Viewing changes to tools/toollib.c

  • Committer: Dmitrijs Ledkovs
  • Date: 2012-08-15 09:45:58 UTC
  • Revision ID: dmitrijs.ledkovs@canonical.com-20120815094558-1fugetlxzs49g6g9
quilt push

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/toollib.c
1505
1505
int get_activation_monitoring_mode(struct cmd_context *cmd,
1506
1506
                                   int *monitoring_mode)
1507
1507
{
1508
 
        *monitoring_mode = DEFAULT_DMEVENTD_MONITOR;
1509
 
 
1510
1508
        if (arg_count(cmd, monitor_ARG) &&
1511
1509
            (arg_count(cmd, ignoremonitoring_ARG) ||
1512
1510
             arg_count(cmd, sysinit_ARG))) {
1514
1512
                return 0;
1515
1513
        }
1516
1514
 
1517
 
        if (arg_count(cmd, monitor_ARG))
1518
 
                *monitoring_mode = arg_int_value(cmd, monitor_ARG,
 
1515
        *monitoring_mode = find_config_tree_bool(cmd, "activation/monitoring",
1519
1516
                                                 DEFAULT_DMEVENTD_MONITOR);
1520
 
        else if (is_static() || arg_count(cmd, ignoremonitoring_ARG) ||
1521
 
                 arg_count(cmd, sysinit_ARG) ||
1522
 
                 !find_config_tree_bool(cmd, "activation/monitoring",
1523
 
                                        DEFAULT_DMEVENTD_MONITOR))
 
1517
 
 
1518
        if (is_static() || arg_count(cmd, ignoremonitoring_ARG) ||
 
1519
                 arg_count(cmd, sysinit_ARG))
1524
1520
                *monitoring_mode = DMEVENTD_MONITOR_IGNORE;
 
1521
        else if (arg_count(cmd, monitor_ARG))
 
1522
                *monitoring_mode = arg_int_value(cmd, monitor_ARG,
 
1523
                                                 *monitoring_mode);
1525
1524
 
1526
1525
        return 1;
1527
1526
}