Re: [PATCHv2 2/4] kdumpctl: rely on the timestamp of scripts' directory to tell modification

[Kairui Song]

Hi Pingfan,

On Tue, Jul 7, 2020 at 1:23 PM Pingfan Liu <piliu(a)redhat.com&gt; wrote:
>  Checking modification against a file can not detect a removing file in
>  "/etc/kdump/post.d/ /etc/kdump/pre.d/".  Hence for directory, resorting to
>  modified time of directory.
>
>  Signed-off-by: Pingfan Liu <piliu(a)redhat.com&gt;
>  ---
>   kdumpctl | 8 +++++---
>   1 file changed, 5 insertions(+), 3 deletions(-)
>
>  diff --git a/kdumpctl b/kdumpctl
>  index d3ec4d7..181c7d6 100755
>  --- a/kdumpctl
>  +++ b/kdumpctl
>  @@ -338,6 +338,7 @@ check_files_modified()
>
>          EXTRA_BINS=`grep ^kdump_post $KDUMP_CONFIG_FILE | cut -d\  -f2`
>          CHECK_FILES=`grep ^kdump_pre $KDUMP_CONFIG_FILE | cut -d\  -f2`
>  +       HOOKS_DIR="/etc/kdump/post.d/ /etc/kdump/pre.d/"
>          if [ -d /etc/kdump/post.d ]; then
>                  for file in /etc/kdump/post.d/*; do
>                          if [ -x "$file" ]; then
>  @@ -354,7 +355,7 @@ check_files_modified()
>          fi
>          CORE_COLLECTOR=`grep ^core_collector $KDUMP_CONFIG_FILE | cut -d\  -f2`
>          CORE_COLLECTOR=`type -P $CORE_COLLECTOR`
>  -       EXTRA_BINS="$EXTRA_BINS $CHECK_FILES $POST_FILES $PRE_FILES"
>  +       EXTRA_BINS="$EXTRA_BINS $CHECK_FILES" 
This seems break the detection of timestamp of each file, with this change:
[root@localhost post.d]# touch test.sh
[root@localhost post.d]# kdumpctl restart
kexec: unloaded kdump kernel
Stopping kdump: [OK]
kexec: loaded kdump kernel
Starting kdump: [OK]

kdumpctl can't see the file change now. If I revert only this line, it
works again. I think we need to check both the timestamp of the folder
and files in it.

>          CHECK_FILES=`grep ^extra_bins $KDUMP_CONFIG_FILE | cut -d\ 
> -f2-`
>          EXTRA_BINS="$EXTRA_BINS $CHECK_FILES"
>          files="$KDUMP_CONFIG_FILE $kdump_kernel $EXTRA_BINS $CORE_COLLECTOR"
>  @@ -382,10 +383,11 @@ check_files_modified()
>                  done
>          fi
>
>  -       check_exist "$files" && check_executable
> "$EXTRA_BINS"
>  +       check_exist "$files" && check_executable "$EXTRA_BINS
> $PRE_FILES $POST_FILES"
>          [ $? -ne 0 ] && return 2
>
>  -       for file in $files; do
>  +       check_list="$files $HOOKS_DIR"
>  +       for file in $check_list; do
>                  if [ -e "$file" ]; then
>                          time_stamp=`stat -c "%Y" $file`
>                          if [ "$time_stamp" -gt "$image_time" ]; then
>  --
>  2.25.4
>  

-- 
Best Regards,
Kairui Song