From 72bcbe256a6612954ea24175538660864e65e26d Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Mon, 18 Apr 2016 13:30:18 +0100 Subject: [PATCH 2/4] Add configure option to re-enable updating of config files Upstream-Status: Pending Signed-off-by: Joshua Lock --- configure.ac | 7 +++++++ src/heuristics.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ee05258..5cbc450 100644 --- a/configure.ac +++ b/configure.ac @@ -153,6 +153,13 @@ AS_IF([test "x$enable_tar_selinux" = "xyes"], [TARSELINUX=no] ) +AC_ARG_ENABLE( + [stateless], + AS_HELP_STRING([--disable-stateless],[OS is not stateless, do not ignore configuration files (stateless by default)]), + AC_DEFINE(OS_IS_STATELESS,0,[OS is not stateless]), + AC_DEFINE(OS_IS_STATELESS,1,[OS is stateless]) +) + AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [path to systemd system service dir @<:@default=/usr/lib/systemd/system@:>@]), [unitpath=${withval}], [unitpath="$($PKG_CONFIG --variable=systemdsystemunitdir systemd)"]) diff --git a/src/heuristics.c b/src/heuristics.c index 1b5d6c9..a2615f3 100644 --- a/src/heuristics.c +++ b/src/heuristics.c @@ -27,6 +27,7 @@ #include #include +#include "config.h" #include "swupd.h" /* trailing slash is to indicate dir itself is expected to exist, but @@ -121,8 +122,8 @@ void apply_heuristics(struct file *file) */ bool ignore(struct file *file) { - if ((file->is_config) || - is_config(file->filename) || // ideally we trust the manifest but short term reapply check here + if ((OS_IS_STATELESS && file->is_config) || + (OS_IS_STATELESS && is_config(file->filename)) || // ideally we trust the manifest but short term reapply check here (file->is_state) || is_state(file->filename) || // ideally we trust the manifest but short term reapply check here (file->is_boot && file->is_deleted) || -- 2.1.4