diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-06 13:37:54 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-06 13:37:54 -0300 |
| commit | a48d075b90120462b9f97ab95a224d47e072f7dd (patch) | |
| tree | 8ba729381a11d91f09b298d888636425c549498b /libre/linux-libre/linux-libre.install | |
| parent | 4ce84837520f8c56ae998d5d2d98380faf3e3eb5 (diff) | |
| parent | 8ab3c2d0517cb4db3ab2f7635d0b71b701e464ba (diff) | |
| download | abslibre-a48d075b90120462b9f97ab95a224d47e072f7dd.tar.gz abslibre-a48d075b90120462b9f97ab95a224d47e072f7dd.tar.bz2 abslibre-a48d075b90120462b9f97ab95a224d47e072f7dd.zip | |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'libre/linux-libre/linux-libre.install')
| -rwxr-xr-x[-rw-r--r--] | libre/linux-libre/linux-libre.install | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 6a2a2795a..8a3791240 100644..100755 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,14 +2,19 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.4.0-1.2-LIBRE +KERNEL_VERSION=3.6.6-1-LIBRE + +# 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 ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if command -v mkinitcpio 2>&1 > /dev/null; then + 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 @@ -28,7 +33,7 @@ post_install () { post_upgrade() { pacman -Q grub &>/dev/null hasgrub=$? - pacman -Q grub2-common &>/dev/null + pacman -Q grub-common &>/dev/null hasgrub2=$? pacman -Q lilo &>/dev/null haslilo=$? @@ -51,8 +56,10 @@ post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi } post_remove() { |