chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysctl: always write net.ipv4.conf.all.xyz= in addition to net.ipv4.conf.default...
[elogind.git]
/
src
/
kernel-install
/
90-loaderentry.install
diff --git
a/src/kernel-install/90-loaderentry.install
b/src/kernel-install/90-loaderentry.install
index 6fbb14908a596301702fc2bd96084aabc8a6d3eb..c17b8a98d51bfcab2ad240bd704e6db1d3f19ebe 100644
(file)
--- a/
src/kernel-install/90-loaderentry.install
+++ b/
src/kernel-install/90-loaderentry.install
@@
-32,6
+32,8
@@
fi
if [[ -f /etc/os-release ]]; then
. /etc/os-release
if [[ -f /etc/os-release ]]; then
. /etc/os-release
+elif [[ -f /usr/lib/os-release ]]; then
+ . /usr/lib/os-release
fi
if ! [[ $PRETTY_NAME ]]; then
fi
if ! [[ $PRETTY_NAME ]]; then
@@
-59,7
+61,9
@@
if ! [[ ${BOOT_OPTIONS[*]} ]]; then
exit 1
fi
exit 1
fi
-cp --preserve "$KERNEL_IMAGE" "$BOOT_DIR_ABS/linux" || {
+cp "$KERNEL_IMAGE" "$BOOT_DIR_ABS/linux" &&
+ chown root:root "$BOOT_DIR_ABS/linux" &&
+ chmod 0644 "$BOOT_DIR_ABS/linux" || {
echo "Could not copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/linux'." >&2
exit 1
}
echo "Could not copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/linux'." >&2
exit 1
}
@@
-77,6
+81,7
@@
mkdir -p "${LOADER_ENTRY%/*}" || {
echo "linux $BOOT_DIR/linux"
[[ -f $BOOT_DIR_ABS/initrd ]] && \
echo "initrd $BOOT_DIR/initrd"
echo "linux $BOOT_DIR/linux"
[[ -f $BOOT_DIR_ABS/initrd ]] && \
echo "initrd $BOOT_DIR/initrd"
+ :
} > "$LOADER_ENTRY" || {
echo "Could not create loader entry '$LOADER_ENTRY'." >&2
exit 1
} > "$LOADER_ENTRY" || {
echo "Could not create loader entry '$LOADER_ENTRY'." >&2
exit 1