!53 bring back 51-dracut-rescue-postinst.sh for rescue mode
From: @panxh_purple Reviewed-by: @overweight Signed-off-by: @overweight
This commit is contained in:
commit
c73c7d5557
91
backport-Bring-back-51-dracut-rescue-postinst.sh.patch
Normal file
91
backport-Bring-back-51-dracut-rescue-postinst.sh.patch
Normal file
@ -0,0 +1,91 @@
|
||||
From 819ea3865161d440353b2f961f3dfeaabeed333d Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
Date: Thu, 26 Jul 2018 12:49:45 +0200
|
||||
Subject: [PATCH] Bring back 51-dracut-rescue-postinst.sh
|
||||
|
||||
can only be obsoleted after F30
|
||||
|
||||
Reference:https://github.com/dracutdevs/dracut/commit/819ea3865161d440353b2f961f3dfeaabeed333d
|
||||
Conflict:delete contents of dracut.spec
|
||||
---
|
||||
51-dracut-rescue-postinst.sh | 68 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 68 insertions(+)
|
||||
create mode 100755 51-dracut-rescue-postinst.sh
|
||||
|
||||
diff --git a/51-dracut-rescue-postinst.sh b/51-dracut-rescue-postinst.sh
|
||||
new file mode 100755
|
||||
index 0000000..67f5b71
|
||||
--- /dev/null
|
||||
+++ b/51-dracut-rescue-postinst.sh
|
||||
@@ -0,0 +1,68 @@
|
||||
+#!/bin/bash
|
||||
+
|
||||
+export LANG=C
|
||||
+
|
||||
+KERNEL_VERSION="$1"
|
||||
+KERNEL_IMAGE="$2"
|
||||
+
|
||||
+[[ -f /etc/os-release ]] && . /etc/os-release
|
||||
+
|
||||
+if [[ ! -f /etc/machine-id ]] || [[ ! -s /etc/machine-id ]]; then
|
||||
+ systemd-machine-id-setup
|
||||
+fi
|
||||
+
|
||||
+[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
|
||||
+
|
||||
+[[ $MACHINE_ID ]] || exit 1
|
||||
+[[ -f $KERNEL_IMAGE ]] || exit 1
|
||||
+
|
||||
+INITRDFILE="/boot/initramfs-0-rescue-${MACHINE_ID}.img"
|
||||
+NEW_KERNEL_IMAGE="${KERNEL_IMAGE%/*}/vmlinuz-0-rescue-${MACHINE_ID}"
|
||||
+
|
||||
+[[ -f $INITRDFILE ]] && [[ -f $NEW_KERNEL_IMAGE ]] && exit 0
|
||||
+
|
||||
+dropindirs_sort()
|
||||
+{
|
||||
+ suffix=$1; shift
|
||||
+ args=("$@")
|
||||
+ files=$(
|
||||
+ while (( $# > 0 )); do
|
||||
+ for i in ${1}/*${suffix}; do
|
||||
+ [[ -f $i ]] && echo ${i##*/}
|
||||
+ done
|
||||
+ shift
|
||||
+ done | sort -Vu
|
||||
+ )
|
||||
+
|
||||
+ for f in $files; do
|
||||
+ for d in "${args[@]}"; do
|
||||
+ if [[ -f "$d/$f" ]]; then
|
||||
+ echo "$d/$f"
|
||||
+ continue 2
|
||||
+ fi
|
||||
+ done
|
||||
+ done
|
||||
+}
|
||||
+
|
||||
+# source our config dir
|
||||
+for f in $(dropindirs_sort ".conf" "/etc/dracut.conf.d" "/usr/lib/dracut/dracut.conf.d"); do
|
||||
+ [[ -e $f ]] && . "$f"
|
||||
+done
|
||||
+
|
||||
+[[ $dracut_rescue_image != "yes" ]] && exit 0
|
||||
+
|
||||
+if [[ ! -f $INITRDFILE ]]; then
|
||||
+ dracut --no-hostonly -a "rescue" "$INITRDFILE" "$KERNEL_VERSION"
|
||||
+ ((ret+=$?))
|
||||
+fi
|
||||
+
|
||||
+if [[ ! -f $NEW_KERNEL_IMAGE ]]; then
|
||||
+ cp --reflink=auto "$KERNEL_IMAGE" "$NEW_KERNEL_IMAGE"
|
||||
+ ((ret+=$?))
|
||||
+fi
|
||||
+
|
||||
+new-kernel-pkg --install "$KERNEL_VERSION" --kernel-image "$NEW_KERNEL_IMAGE" --initrdfile "$INITRDFILE" --banner "$NAME $VERSION_ID Rescue $MACHINE_ID"
|
||||
+
|
||||
+((ret+=$?))
|
||||
+
|
||||
+exit $ret
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
10
dracut.spec
10
dracut.spec
@ -9,7 +9,7 @@
|
||||
|
||||
Name: dracut
|
||||
Version: 055
|
||||
Release: 4
|
||||
Release: 5
|
||||
|
||||
Summary: Initramfs generator using udev
|
||||
|
||||
@ -38,6 +38,7 @@ Patch11: backport-feat-lvm-update-lvm-command-options.patch
|
||||
Patch12: backport-feat-lvm-use-generated-filter-when-none-is-set.patch
|
||||
Patch13: backport-feat-lvm-only-run-lvchange-for-LV-that-is-seen-on-de.patch
|
||||
Patch14: backport-fix-lvm-restore-setting-LVM_MD_PV_ACTIVATED.patch
|
||||
Patch15: backport-Bring-back-51-dracut-rescue-postinst.sh.patch
|
||||
|
||||
Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
|
||||
Source2: openEuler.conf.example
|
||||
@ -282,6 +283,9 @@ rm -f -- $RPM_BUILD_ROOT%{_bindir}/lsinitrd
|
||||
%if 0%{?openEuler} || 0%{?fedora} || 0%{?rhel}
|
||||
echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-image.conf
|
||||
echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-rescue.conf
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d
|
||||
install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
|
||||
%endif
|
||||
|
||||
%files
|
||||
@ -504,9 +508,13 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
|
||||
%{dracutlibdir}/dracut.conf.d/02-rescue.conf
|
||||
%if 0%{?openEuler} || 0%{?fedora} || 0%{?rhel}
|
||||
%{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
|
||||
%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Apr 11 2022 panxiaohe <panxh.life@foxmail.com> - 055-5
|
||||
- bring back 51-dracut-rescue-postinst.sh for rescue mode
|
||||
|
||||
* Wed Feb 16 2022 panxiaohe <panxiaohe@h-partners.com> - 055-4
|
||||
- backport patches from upstream: improve lvm module
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user