Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 2 insertions, 36 deletions

diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index d0d47c6a0..7a4a271df 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -4,9 +4,6 @@
 KERNEL_NAME=-lts
 KERNEL_VERSION=
 
-# set a sane PATH to ensure that critical utils like depmod will be found
-export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
-
 post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
@@ -15,40 +12,9 @@ post_install () {
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
-
-  # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
-    loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
-    [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
-    if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
-      # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
-        boot/kernel26${KERNEL_NAME}-fallback.img
-      ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
-    fi
-  fi
 }
 
 post_upgrade() {
-  pacman -Q grub &>/dev/null
-  hasgrub=$?
-  pacman -Q grub-common &>/dev/null
-  hasgrub2=$?
-  pacman -Q lilo &>/dev/null
-  haslilo=$?
-  # reminder notices
-  if [ $haslilo -eq 0 ]; then
-    echo ">>>"
-    if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
-      echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
-    else
-      echo ">>> You appear to be using the LILO bootloader. You should run"
-      echo ">>> 'lilo' before rebooting."
-    fi
-    echo ">>>"
-  fi
-
   if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
     echo "WARNING: /boot appears to be a separate partition but is not mounted."
   fi
@@ -64,6 +30,6 @@ post_upgrade() {
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
+  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
+  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
 }