chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel-install: fixed paths in boot loader entry
[elogind.git]
/
src
/
kernel-install
/
kernel-install
diff --git
a/src/kernel-install/kernel-install
b/src/kernel-install/kernel-install
index 1a694578a1c563f5f62c93a019aa12a91da117c0..769c6096062ed16e2d9e5388672afe511c6b31c8 100644
(file)
--- a/
src/kernel-install/kernel-install
+++ b/
src/kernel-install/kernel-install
@@
-67,7
+67,9
@@
if ! ( [[ $COMMAND ]] && [[ $KERNEL_VERSION ]] && [[ $KERNEL_IMAGE ]] ); then
exit 1
fi
exit 1
fi
-BOOT_DIR="/boot/$MACHINE_ID/$KERNEL_VERSION"
+BOOT_DIR="$MACHINE_ID/$KERNEL_VERSION"
+BOOT_DIR_ABS="/boot/$BOOT_DIR"
+LOADER_ENTRY="/boot/loader/entries/${ID}-${KERNEL_VERSION}-${MACHINE_ID}.conf"
ret=0
dropindirs_sort()
ret=0
dropindirs_sort()
@@
-99,15
+101,15
@@
readarray -t PLUGINS < <(
case "$COMMAND" in
add)
case "$COMMAND" in
add)
- mkdir -p "$BOOT_DIR" || exit 1
+ mkdir -p "$BOOT_DIR
_ABS
" || exit 1
for f in "${PLUGINS[@]}"; do
for f in "${PLUGINS[@]}"; do
- [[ -x $f ]] && "$f" add "$KERNEL_VERSION" "$BOOT_DIR"
+ [[ -x $f ]] && "$f" add "$KERNEL_VERSION" "$BOOT_DIR
_ABS
"
((ret+=$?))
done
((ret+=$?))
done
- if ! cp --preserve "$KERNEL_IMAGE" "$BOOT_DIR"/linux; then
- echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR/linux'!" >&2
+ if ! cp --preserve "$KERNEL_IMAGE" "$BOOT_DIR
_ABS
"/linux; then
+ echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR
_ABS
/linux'!" >&2
fi
[[ -d /boot/loader/entries ]] || mkdir -p /boot/loader/entries
fi
[[ -d /boot/loader/entries ]] || mkdir -p /boot/loader/entries
@@
-116,28
+118,28
@@
case "$COMMAND" in
echo "title $PRETTY_NAME"
echo "version $KERNEL_VERSION"
echo "machine-id $MACHINE_ID"
echo "title $PRETTY_NAME"
echo "version $KERNEL_VERSION"
echo "machine-id $MACHINE_ID"
- echo "options $
BOOT_OPTIONS
"
+ echo "options $
{BOOT_OPTIONS[@]}
"
echo "linux $BOOT_DIR/linux"
echo "linux $BOOT_DIR/linux"
- [[ -f "${BOOT_DIR}"/initrd ]] && \
+ [[ -f "${BOOT_DIR
_ABS
}"/initrd ]] && \
echo "initrd $BOOT_DIR/initrd"
:
echo "initrd $BOOT_DIR/initrd"
:
- } >
"/boot/loader/entries/${ID}-${KERNEL_VERSION}-${MACHINE_ID}.conf"
+ } >
$LOADER_ENTRY
((ret+=$?))
((ret+=$?))
- if ! [[ -f
"/boot/loader/entries/${ID}-${KERNEL_VERSION}-${MACHINE_ID}.conf"
]]; then
- echo "Could not create '
/boot/loader/entries/${ID}-${KERNEL_VERSION}-${MACHINE_ID}.conf
'!" >&2
+ if ! [[ -f
$LOADER_ENTRY
]]; then
+ echo "Could not create '
$LOADER_ENTRY
'!" >&2
fi
;;
remove)
for f in "${PLUGINS[@]}"; do
fi
;;
remove)
for f in "${PLUGINS[@]}"; do
- [[ -x $f ]] && "$f" remove "$KERNEL_VERSION" "$BOOT_DIR"
+ [[ -x $f ]] && "$f" remove "$KERNEL_VERSION" "$BOOT_DIR
_ABS
"
((ret+=$?))
done
((ret+=$?))
done
- rm -fr "$BOOT_DIR"
- rm -f "
/boot/loader/entries/${ID}-${KERNEL_VERSION}-${MACHINE_ID}.conf
"
+ rm -fr "$BOOT_DIR
_ABS
"
+ rm -f "
$LOADER_ENTRY
"
;;
*)
;;
*)