Raymond Wooninck 2013-10-04 17:24:02 +00:00 committed by Git OBS Bridge
parent dd62f72388
commit 650ca2a2ce
6 changed files with 28 additions and 4 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Oct 4 17:23:19 UTC 2013 - tittiatcoke@gmail.com
- Add patch mkinitrd_update_bootloader.diff so that after
generating the initrd, the update-bootloader is called to update
grub2.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 4 16:26:20 UTC 2013 - tittiatcoke@gmail.com Fri Oct 4 16:26:20 UTC 2013 - tittiatcoke@gmail.com

View File

@ -64,6 +64,8 @@ Patch11: root_fs.patch
Patch12: suse_host_only.patch Patch12: suse_host_only.patch
# PATCH-FIX-OPENSUSE Write caller and used parameters to syslog if mkinitrd is called - trenn@suse.de # PATCH-FIX-OPENSUSE Write caller and used parameters to syslog if mkinitrd is called - trenn@suse.de
Patch13: suse_only_logger.patch Patch13: suse_only_logger.patch
# PATCH-FIX-OPENSUSE Call the update-bootloader after dracut finished creating the initrd - tittiatcoke@gmail.com
Patch14: mkinitrd_update_bootloader.diff
BuildRequires: bash BuildRequires: bash
BuildRequires: dash BuildRequires: dash
@ -151,6 +153,7 @@ This package contains tools to assemble the local initrd and host configuration.
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1
%build %build
%configure\ %configure\

View File

@ -79,7 +79,7 @@ Index: dracut-033/mkinitrd-dracut.sh
while (($# > 0)); do while (($# > 0)); do
case ${1%%=*} in case ${1%%=*} in
--with-usb) read_arg usbmodule "$@" || shift $? --with-usb) read_arg usbmodule "$@" || shift $?
@@ -119,7 +180,8 @@ while (($# > 0)); do @@ -124,7 +185,8 @@ while (($# > 0)); do
shift shift
done done

View File

@ -0,0 +1,14 @@
diff -urNB dracut-033/mkinitrd-dracut.sh new/mkinitrd-dracut.sh
--- dracut-033/mkinitrd-dracut.sh 2013-10-04 19:12:51.654775024 +0200
+++ new/mkinitrd-dracut.sh 2013-10-04 19:14:25.088173450 +0200
@@ -236,3 +236,10 @@
fi
fi
done
+
+if [ -z "$(type -p update-bootloader)" ] ; then
+ echo 2>&1 "Did not refresh the bootloader. You might need to refresh it manually."
+else
+ update-bootloader --refresh
+fi
+

View File

@ -26,7 +26,7 @@ index d8e92f3..803abc0 100755
-b) read_arg boot_dir "$@" || shift $? -b) read_arg boot_dir "$@" || shift $?
if [ ! -d $boot_dir ];then if [ ! -d $boot_dir ];then
error "Boot directory $boot_dir does not exist" error "Boot directory $boot_dir does not exist"
@@ -123,6 +125,7 @@ done @@ -128,6 +130,7 @@ done
targets=( $targets ) targets=( $targets )
[[ $kernels ]] && kernels=( $kernels ) [[ $kernels ]] && kernels=( $kernels )
@ -34,7 +34,7 @@ index d8e92f3..803abc0 100755
for ((i=0 ; $i<${#targets[@]} ; i++)); do for ((i=0 ; $i<${#targets[@]} ; i++)); do
if [[ $img_vers ]];then if [[ $img_vers ]];then
@@ -132,9 +135,21 @@ for ((i=0 ; $i<${#targets[@]} ; i++)); do @@ -137,9 +140,21 @@ for ((i=0 ; $i<${#targets[@]} ; i++)); do
fi fi
kernel="${kernels[$i]}" kernel="${kernels[$i]}"

View File

@ -52,7 +52,7 @@ index f7b53f1..a1519ea 100755
;; ;;
-i) read_arg initrd_images "$@" || shift $? -i) read_arg initrd_images "$@" || shift $?
for initrd_image in $initrd_images;do for initrd_image in $initrd_images;do
@@ -188,6 +193,9 @@ done @@ -193,6 +198,9 @@ done
targets=( $targets ) targets=( $targets )
[[ $kernels ]] && kernels=( $kernels ) [[ $kernels ]] && kernels=( $kernels )