remove potable efi helper

pull/4/head
artoo 3 years ago
parent b2d2877df9
commit 96cc41dcde
  1. 15
      Makefile
  2. 49
      bin/99_zzz-portable-efi
  3. 8
      bin/desktop-items
  4. 15
      data/grub2-portable-efi
  5. 2
      lib/util-live.sh

@ -45,12 +45,6 @@ S6_BUNDLE = \
S6_SV = \
data/s6/pacman-init.run
GRUB_DEFAULT = \
data/grub2-portable-efi
GRUB_D = \
bin/99_zzz-portable-efi
XDG = $(wildcard data/*.desktop)
XBIN = bin/desktop-items
@ -92,13 +86,6 @@ install_s6:
install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/live
install $(BMODE) $(S6_BUNDLE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/live/
install_portable_efi:
install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/default
install $(BMODE) $(GRUB_DEFAULT) $(DESTDIR)$(SYSCONFDIR)/default
install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/grub.d
install $(BMODE) $(GRUB_D) $(DESTDIR)$(SYSCONFDIR)/grub.d
install_xdg:
install -dm0755 $(DESTDIR)$(PREFIX)/bin
install -m0755 ${XBIN} $(DESTDIR)$(PREFIX)/bin
@ -106,6 +93,6 @@ install_xdg:
install -dm0755 $(DESTDIR)$(SYSCONFDIR)/skel/.config/autostart
install -m0755 ${XDG} $(DESTDIR)$(SYSCONFDIR)/skel/.config/autostart
install: install_base install_rc install_s6 install_portable_efi install_xdg
install: install_base install_rc install_runit install_s6 install_xdg
.PHONY: install

@ -1,49 +0,0 @@
#!/bin/sh
# grub-mkconfig helper script.
#
# Copyright © 2014 Niall Walsh <niallwalsh@celtux.org>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
set -e
AT_EFI_STANDALONE=""
AT_EFI_PORTABLE_PATH="/boot/efi/EFI/BOOT"
# override tool behaviour through /etc/default/grub2-fll-standalone
if [ -r /etc/default/grub2-portable-efi ]; then
. /etc/default/grub2-portable-efi
fi
patt='[[:space:]]-o[[:space:]]\+/boot/grub/grub.cfg'
# do nothing if disabled or grub-mkconfig is generating /boot/grub/grub.cfg
( [ "${AT_EFI_STANDALONE}" != "disable" ] && \
ps x | grep 'grub-mkconfig[[:space:]]' | grep -q -e "${patt}[[:space:]]" -e "${patt}$" ) || exit
beeb="${AT_EFI_PORTABLE_PATH}"
if [ -e "${beeb}" ]; then
# do not do anything to a beeb we didn't create
[ ! -e "${beeb}/fullstory" ] && exit
else
# create beeb and mark it as ours
mkdir -p "${beeb}"
touch "${beeb}/fullstory"
fi
for platform in i386-efi x86_64-efi ; do
filename="bootx64"
[ "${platform}" = "i386-efi" ] && filename="bootia32"
[ -e /usr/lib/grub/${platform} ] && grub-mkstandalone \
-o ${beeb}/${filename}.efi --compress=xz -O ${platform} \
/boot/grub/grub.cfg=/boot/grub/grub.cfg.new 2>&1 > /dev/null
done

@ -3,10 +3,10 @@
xdg=$(xdg-user-dir DESKTOP)
src=/usr/share/applications
if [[ -f $src/org.kde.konversation.desktop ]]; then
install -m644 $src/org.kde.konversation.desktop \
$xdg/org.kde.konversation.desktop
fi
# if [[ -f $src/org.kde.konversation.desktop ]]; then
# install -m644 $src/org.kde.konversation.desktop \
# $xdg/org.kde.konversation.desktop
# fi
# if [[ -f /usr/bin/calamares ]]; then
# cp $src/calamares.desktop \

@ -1,15 +0,0 @@
# Defaults for grub2-portable-efi update-grub helper
# sourced by grub2's update-grub
# installed at /etc/default/grub2-portable-efi by the maintainer scripts
#
# This is a POSIX shell fragment
#
# specify is this should be disabled (set to "disable")
# default:
#AT_EFI_STANDALONE=""
# specify where to install the portable efi
# default: /boot/efi/EFI/BOOT
#AT_EFI_PORTABLE_PATH="/boot/efi/EFI/BOOT"

@ -172,7 +172,7 @@ find_legacy_keymap(){
continue
fi
if [[ "${mapping[3]}" = "-" ]]; then
if [[ "${mapping[3]}" == "-" ]]; then
mapping[3]=""
fi

Loading…
Cancel
Save