3210e44b88
- Add ACPI table override ability
- Adjust mkinitrd-dracut.sh to SUSE mkinitrd:
<none> : Before gives a "usage" error -> now scans /boot for kernels
and builds corresponding inirtrds for them
-i -k : Pass a list of kernels and initrd targets
(not sure it was worth the hassle to be able to pass)
-b : Boot directory to search for kernel images
-d : Change root file system. Not tested whether dracut's behavior
matches exactly what our mkinitrd does.
-s : Dummy (should even be obsolete in latest mkinitrd)
- Write caller and used parameters to syslog if mkinitrd is called.
So that those can easily be fixed and checked for correctness.
This should get reverted again before a bigger release.
OBS-URL: https://build.opensuse.org/request/show/201877
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=56
92 lines
2.9 KiB
Plaintext
92 lines
2.9 KiB
Plaintext
mkinitrd-dracut.sh: Allow mkinitrd call without passing any parameters
|
|
|
|
Before this gave a "usage" error.
|
|
Now boot_dir (by default /boot) is scanned for available kernels and sane
|
|
initrd default targets get defined and the corresponding initramfs files
|
|
are generated.
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
|
|
Index: dracut-033/mkinitrd-dracut.sh
|
|
===================================================================
|
|
--- dracut-033.orig/mkinitrd-dracut.sh
|
|
+++ dracut-033/mkinitrd-dracut.sh
|
|
@@ -46,6 +46,67 @@ read_arg() {
|
|
fi
|
|
}
|
|
|
|
+# Taken over from SUSE mkinitrd
|
|
+default_kernel_images() {
|
|
+ local regex kernel_image kernel_version version_version initrd_image
|
|
+ local qf='%{NAME}-%{VERSION}-%{RELEASE}\n'
|
|
+
|
|
+ case "$(uname -m)" in
|
|
+ s390|s390x)
|
|
+ regex='image'
|
|
+ ;;
|
|
+ ppc|ppc64)
|
|
+ regex='vmlinux'
|
|
+ ;;
|
|
+ i386|x86_64)
|
|
+ regex='vmlinuz'
|
|
+ ;;
|
|
+ arm*)
|
|
+ regex='[uz]Image'
|
|
+ ;;
|
|
+ aarch64)
|
|
+ regex='Image'
|
|
+ ;;
|
|
+ *) regex='vmlinu.'
|
|
+ ;;
|
|
+ esac
|
|
+
|
|
+ # user mode linux
|
|
+ if grep -q UML /proc/cpuinfo; then
|
|
+ regex='linux'
|
|
+ fi
|
|
+
|
|
+ kernel_images=""
|
|
+ initrd_images=""
|
|
+ for kernel_image in $(ls $boot_dir \
|
|
+ | sed -ne "\|^$regex\(-[0-9.]\+-[0-9]\+-[a-z0-9]\+$\)\?|p" \
|
|
+ | grep -v kdump$ ) ; do
|
|
+
|
|
+ # Note that we cannot check the RPM database here -- this
|
|
+ # script is itself called from within the binary kernel
|
|
+ # packages, and rpm does not allow recursive calls.
|
|
+
|
|
+ [ -L "$boot_dir/$kernel_image" ] && continue
|
|
+ [ "${kernel_image%%.gz}" != "$kernel_image" ] && continue
|
|
+ kernel_version=$(/usr/bin/get_kernel_version \
|
|
+ $boot_dir/$kernel_image 2> /dev/null)
|
|
+ initrd_image=$(echo $kernel_image | sed -e "s|${regex}|initrd|")
|
|
+ if [ "$kernel_image" != "$initrd_image" -a \
|
|
+ -n "$kernel_version" -a \
|
|
+ -d "/lib/modules/$kernel_version" ]; then
|
|
+ kernel_images="$kernel_images $boot_dir/$kernel_image"
|
|
+ initrd_images="$initrd_images $boot_dir/$initrd_image"
|
|
+ fi
|
|
+ done
|
|
+ for kernel_image in $kernel_images;do
|
|
+ kernels="$kernels ${kernel_image#*-}"
|
|
+ done
|
|
+ for initrd_image in $initrd_images;do
|
|
+ targets="$targets $initrd_image"
|
|
+ done
|
|
+
|
|
+}
|
|
+
|
|
while (($# > 0)); do
|
|
case ${1%%=*} in
|
|
--with-usb) read_arg usbmodule "$@" || shift $?
|
|
@@ -119,7 +180,8 @@ while (($# > 0)); do
|
|
shift
|
|
done
|
|
|
|
-[[ $targets && $kernels ]] || usage
|
|
+[[ $targets && $kernels ]] || default_kernel_images
|
|
+[[ $targets && $kernels ]] || (error "No kernel found in $boot_dir" && usage)
|
|
|
|
# We can have several targets/kernels, transform the list to an array
|
|
targets=( $targets )
|