87 lines
3.0 KiB
Diff
87 lines
3.0 KiB
Diff
From f1138012c9dc44e6614466c0a8e929fc55e4a5dd Mon Sep 17 00:00:00 2001
|
|
From: Hari Bathini <hbathini@linux.ibm.com>
|
|
Date: Fri, 11 Jun 2021 15:20:28 +0530
|
|
Subject: [PATCH] fix(dracut.sh): handle '-i' option to include files beginning
|
|
with '.'
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
While including a directory using '--include' option, the file and
|
|
subdirectory names that begin with '.' are not included. Also, dracut
|
|
throws a warning message when a subdirectory is empty or only has
|
|
files or subdirectories that begin with '.'.
|
|
|
|
For example, while trying to include /tmpdata directory with the
|
|
below tree:
|
|
|
|
# tree -a /tmpdata
|
|
/tmpdata
|
|
├── .anothertestdir
|
|
├── testdir
|
|
│ └── .testsubdir
|
|
└── .testfile
|
|
|
|
dracut throws the below warning message:
|
|
|
|
# dracut --include /tmpdata /root
|
|
cp: cannot stat '/tmpdata/testdir/*': No such file or directory
|
|
#
|
|
|
|
and this is how the included /tmpdata directory tree looks:
|
|
|
|
# tree -a root
|
|
root
|
|
└── testdir
|
|
|
|
No file or directory beginning with '.' is included & also, copying
|
|
/tmpdata/testdir reported "No such file or directory" warning. Using
|
|
'.' instead of '*' in the below command will fix the warning whether
|
|
the directory being copied is empty or only has files or directories
|
|
that begin with dot:
|
|
|
|
$DRACUT_CP -t "$object_destdir" "$dracutsysrootdir$objectname"/*
|
|
|
|
Also, enable 'dotglob' temporarily to include files and directories
|
|
beginning with a `.' in the results of pathname expansion of source
|
|
directory being included.
|
|
|
|
Signed-off-by: Hari Bathini <hbathini@linux.ibm.com>
|
|
|
|
Reference:https://github.com/dracutdevs/dracut/commit/f1138012c9dc44e6614466c0a8e929fc55e4a5dd
|
|
Conflict:NA
|
|
---
|
|
dracut.sh | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/dracut.sh b/dracut.sh
|
|
index 60ac46f4..e7f47752 100755
|
|
--- a/dracut.sh
|
|
+++ b/dracut.sh
|
|
@@ -2067,6 +2067,8 @@ for ((i = 0; i < ${#include_src[@]}; i++)); do
|
|
# check for preexisting symlinks, so we can cope with the
|
|
# symlinks to $prefix
|
|
# Objectname is a file or a directory
|
|
+ reset_dotglob="$(shopt -p dotglob)"
|
|
+ shopt -q -s dotglob
|
|
for objectname in "$src"/*; do
|
|
[[ -e $objectname || -L $objectname ]] || continue
|
|
if [[ -d $objectname ]]; then
|
|
@@ -2077,11 +2079,12 @@ for ((i = 0; i < ${#include_src[@]}; i++)); do
|
|
mkdir -m 0755 -p "$object_destdir"
|
|
chmod --reference="$objectname" "$object_destdir"
|
|
fi
|
|
- $DRACUT_CP -t "$object_destdir" "$dracutsysrootdir$objectname"/*
|
|
+ $DRACUT_CP -t "$object_destdir" "$dracutsysrootdir$objectname"/.
|
|
else
|
|
$DRACUT_CP -t "$destdir" "$dracutsysrootdir$objectname"
|
|
fi
|
|
done
|
|
+ eval "$reset_dotglob"
|
|
elif [[ -e $src ]]; then
|
|
derror "$src is neither a directory nor a regular file"
|
|
else
|
|
--
|
|
2.27.0
|
|
|