wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-26 23:42:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gummiboot: improve consistency of relative paths in kernel hooks

Browse source
This commit is contained in:
Andrew J. Hesford 2020-08-05 12:13:08 -04:00
parent f34677f4a6
commit ce3e0eb42e
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
srcpkgs/gummiboot/files/kernel.d/gummiboot.post-install
View file

@ -13,33 +13,33 @@ if [ "$GUMMIBOOT_DISABLE" ]; then
exit 0 exit 0
fi fi
boot=$ROOTDIR/boot boot="$ROOTDIR/boot"
entries=$boot/loader/entries entries="$boot/loader/entries"
name=void-$VERSION name="void-$VERSION"
entry=$entries/$name.conf entry="$entries/$name.conf"
options=$boot/loader/void-options.conf options="$boot/loader/void-options.conf"
loader=$boot/loader/loader.conf loader="$boot/loader/loader.conf"
[ -d $boot ] || exit 0 [ -d "$boot" ] || exit 0
mkdir -p $entries mkdir -p "$entries"
cat <<-EOF > $entry cat <<-EOF > "$entry"
title Void Linux title Void Linux
version $VERSION version $VERSION
linux /vmlinuz-$VERSION linux /vmlinuz-$VERSION
initrd /initramfs-$VERSION.img initrd /initramfs-$VERSION.img
EOF EOF
if [ -r $options ]; then if [ -r "$options" ]; then
# Add user provided options from /boot/loader/void-options.conf: # Add user provided options from /boot/loader/void-options.conf:
printf 'options %s\n' "$(cat $options | sed '/^#/d;/^$/d')" >> $entry printf 'options %s\n' "$(cat "$options" | sed '/^#/d;/^$/d')" >> "$entry"
fi fi
if grep -q ^default $loader 2>/dev/null; then if grep -q ^default "$loader" 2>/dev/null; then
# Replace existing default entry with this entry: # Replace existing default entry with this entry:
sed -i "s/default.*/default $name/" $loader sed -i "s/default.*/default $name/" "$loader"
else else
# Add this entry as the default: # Add this entry as the default:
printf 'default %s\n' $name >>$loader printf 'default %s\n' $name >>"$loader"
fi fi

16
srcpkgs/gummiboot/files/kernel.d/gummiboot.post-remove
View file

@ -7,15 +7,15 @@
PKGNAME="$1" PKGNAME="$1"
VERSION="$2" VERSION="$2"
boot=$ROOTDIR/boot boot="$ROOTDIR/boot"
entries=$boot/loader/entries entries="$boot/loader/entries"
name=void-$VERSION name="void-$VERSION"
entry=$entries/$name.conf entry="$entries/$name.conf"
loader=$boot/loader/loader.conf loader="$boot/loader/loader.conf"
[ -d $boot ] || exit 0 [ -d "$boot" ] || exit 0
rm -f $entry rm -f "$entry"
# No default entry if the removed entry was the default: # No default entry if the removed entry was the default:
sed -i "/^default $name\$/d" $loader [ -e "$loader" ] && sed -i "/^default $name\$/d" "$loader"

2
srcpkgs/gummiboot/template
View file

@ -1,7 +1,7 @@
# Template file for 'gummiboot' # Template file for 'gummiboot'
pkgname=gummiboot pkgname=gummiboot
version=48.1 version=48.1
revision=5 revision=6
archs="i686* x86_64* aarch64*" archs="i686* x86_64* aarch64*"
build_style=gnu-configure build_style=gnu-configure
conf_files="/etc/default/gummiboot" conf_files="/etc/default/gummiboot"