diff --git a/add-option-to-include-file-metadata-in-initramfs.patch b/add-option-to-include-file-metadata-in-initramfs.patch new file mode 100644 index 0000000000000000000000000000000000000000..44866930f2cb40c4cb1e0e7a2ffba0b6350e167c --- /dev/null +++ b/add-option-to-include-file-metadata-in-initramfs.patch @@ -0,0 +1,82 @@ +From c9e154ac506bd4b3baadeb07e8d0a0a5e85fba4a Mon Sep 17 00:00:00 2001 +From: Roberto Sassu +Date: Thu, 13 Jun 2019 14:26:04 +0200 +Subject: [PATCH 1/2] dracut.sh: add -e option to include file metadata in the + initramfs. + +Specify "-e xattr" to include file extended attributes in the initramfs. + +Signed-off-by: Roberto Sassu +--- + dracut.sh | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/dracut.sh b/dracut.sh +index af346f3..2b9fd49 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -240,6 +240,9 @@ Creates initial ramdisk images for preloading modules + Use [FILE] as a splash image when creating an UEFI + executable + --kernel-image [FILE] location of the kernel image ++ -e, --file-metadata [TYPE] ++ Include file metadata in the initramfs. Specify "xattr" ++ to include file extended attributes. + --regenerate-all Regenerate all initramfs images at the default location + for the kernel versions found on the system + +@@ -319,7 +322,7 @@ rearrange_params() + set -- "${newat[@]}" # Set new $@ + + TEMP=$(unset POSIXLY_CORRECT; getopt \ +- -o "a:m:o:d:I:k:c:r:L:fvqlHhMN" \ ++ -o "a:m:o:d:I:k:c:r:L:fvqlHhMNe:" \ + --long kver: \ + --long add: \ + --long force-add: \ +@@ -408,6 +411,7 @@ rearrange_params() + --long no-hostonly-i18n \ + --long hostonly-i18n \ + --long no-machineid \ ++ --long file-metadata: \ + -- "$@") + + if (( $? != 0 )); then +@@ -608,6 +612,8 @@ while :; do + kernel_image_l="$2"; PARMS_TO_STORE+=" '$2'"; shift;; + --no-machineid) + machine_id_l="no";; ++ -e|--file-metadata) ++ file_metadata_l="$2"; PARMS_TO_STORE+=" '$2'"; shift;; + --) shift; break;; + + *) # should not even reach this point +@@ -783,6 +789,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) + [[ $uefi_splash_image_l ]] && uefi_splash_image="$uefi_splash_image_l" + [[ $kernel_image_l ]] && kernel_image="$kernel_image_l" + [[ $machine_id_l ]] && machine_id="$machine_id_l" ++[[ $file_metadata_l ]] && file_metadata_opt="-e $file_metadata_l" + + if ! [[ $outfile ]]; then + if [[ $machine_id != "no" ]]; then +@@ -1988,7 +1995,7 @@ if [[ $create_early_cpio = yes ]]; then + if ! ( + umask 077; cd "$early_cpio_dir/d" + find . -print0 | sort -z \ +- | cpio ${CPIO_REPRODUCIBLE:+--reproducible} --null $cpio_owner_root -H newc -o --quiet > "${DRACUT_TMPDIR}/initramfs.img" ++ | cpio ${CPIO_REPRODUCIBLE:+--reproducible} --null $cpio_owner_root -H newc $file_metadata_opt -o --quiet > "${DRACUT_TMPDIR}/initramfs.img" + ); then + dfatal "dracut: creation of $outfile failed" + exit 1 +@@ -1998,7 +2005,7 @@ fi + if ! ( + umask 077; cd "$initdir" + find . -print0 | sort -z \ +- | cpio ${CPIO_REPRODUCIBLE:+--reproducible} --null $cpio_owner_root -H newc -o --quiet \ ++ | cpio ${CPIO_REPRODUCIBLE:+--reproducible} --null $cpio_owner_root -H newc $file_metadata_opt -o --quiet \ + | $compress >> "${DRACUT_TMPDIR}/initramfs.img" + ); then + dfatal "dracut: creation of $outfile failed" +-- +2.23.0 + diff --git a/dracut.spec b/dracut.spec index d863b078ca819f948b0d35233c607f95f6d9aaef..8e09f821e1d95294d16fe7a7cda8ac5ec2cd3918 100644 --- a/dracut.spec +++ b/dracut.spec @@ -9,7 +9,7 @@ Name: dracut Version: 049 -Release: 8 +Release: 9 Summary: Initramfs generator using udev @@ -34,6 +34,7 @@ Patch9000: check_vol_slaves_all-must-return-1-when-lvm-vgs-fail.patch Patch9001: dracut-network-fixed-net-rules-issue-hence-systemd-r.patch Patch9002: skip-the-broken-sd-in-initqueue.patch Patch9003: use-sleep-replace-check-sys-block.patch +Patch9004: add-option-to-include-file-metadata-in-initramfs.patch Source1: https://www.gnu.org/licenses/lgpl-2.1.txt Source2: openEuler.conf.example @@ -481,6 +482,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %endif %changelog +* Thu Jul 2 2020 Anakin Zhang - 049-9 +- add -e option to include file metadata in initramfs + * Sat Mar 21 2020 openEuler Buildteam - 049-8 - Add buildrequires of gdb