shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-30 23:21:22 +03:00
Code

Merge pull request #24837 from yuwata/kernel-install

Browse Source 
kernel-install: two fixlets
This commit is contained in:
Daan De Meyer 2022-09-28 10:50:55 +02:00 committed by GitHub
commit 4c35aed7f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/kernel-install/kernel-install.in
View File

@ -303,8 +303,8 @@ export KERNEL_INSTALL_LAYOUT="$layout"
export KERNEL_INSTALL_INITRD_GENERATOR="$initrd_generator"
export KERNEL_INSTALL_STAGING_AREA
[ "$layout" = "bls" ]
MAKE_ENTRY_DIR_ABS=$?
MAKE_ENTRY_DIR_ABS=0
[ "$layout" = "bls" ] || MAKE_ENTRY_DIR_ABS=1
ret=0
@ -349,9 +349,8 @@ case "$COMMAND" in
for f in $KERNEL_INSTALL_PLUGINS; do
log_verbose "+$f add $KERNEL_VERSION $ENTRY_DIR_ABS" "$@"
"$f" add "$KERNEL_VERSION" "$ENTRY_DIR_ABS" "$@"
err=$?
err=0
"$f" add "$KERNEL_VERSION" "$ENTRY_DIR_ABS" "$@" || err=$?
[ $err -eq $skip_remaining ] && break
[ $err -ne 0 ] && exit $err
done
@ -360,8 +359,8 @@ case "$COMMAND" in
remove)
for f in $KERNEL_INSTALL_PLUGINS; do
log_verbose "+$f remove $KERNEL_VERSION $ENTRY_DIR_ABS"
"$f" remove "$KERNEL_VERSION" "$ENTRY_DIR_ABS"
err=$?
err=0
"$f" remove "$KERNEL_VERSION" "$ENTRY_DIR_ABS" || err=$?
[ $err -eq $skip_remaining ] && break
[ $err -ne 0 ] && exit $err
done