diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-11-08 03:36:19 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-11-08 03:36:19 -0200 |
| commit | 5c230a8b1124d903bc481ec6753d5503725bdafe (patch) | |
| tree | 5f8d5dc49dc8b410d32f16c02f02f0c55741bdcb | |
| parent | 8dc929d1708345d981ae3ab980f1e6acb9f91542 (diff) | |
| parent | 07cc5b5f7eb1a1b8408d7b7edb0656dc131b5e84 (diff) | |
Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre
| -rw-r--r-- | pcr/grub-legacy/PKGBUILD | 4 | ||||
| -rw-r--r-- | pcr/grub-legacy/install-grub | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pcr/grub-legacy/PKGBUILD b/pcr/grub-legacy/PKGBUILD index f1527d61f..0665d7dd7 100644 --- a/pcr/grub-legacy/PKGBUILD +++ b/pcr/grub-legacy/PKGBUILD @@ -7,7 +7,7 @@ pkgname=grub-legacy _srcname=grub pkgver=0.97 -pkgrel=25.1 +pkgrel=25.parabola1 pkgdesc="A GNU multiboot boot loader (Parabola rebranded)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -33,7 +33,7 @@ backup=('boot/grub/menu.lst') install=grub.install sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb' 'de504b22f586a8919c12ea3446cae3300a8365f0' - '3e23bfee50285c8c7b9ef9ec07964310278b1e09' + '17477352aa00f37e40d3949d5a3bff499668c74b' '157b81dbad3576536b08642242accfa1aeb093a9' 'adbb4685c98797ffb4dc83561ec75698991dddbd' 'f2e0dff29a7c8a45e90aa07298a1b2a9a9d29afc' diff --git a/pcr/grub-legacy/install-grub b/pcr/grub-legacy/install-grub index affc9c38a..1435ce73b 100644 --- a/pcr/grub-legacy/install-grub +++ b/pcr/grub-legacy/install-grub @@ -57,7 +57,7 @@ fi get_grub_map() { [ -e /tmp/dev.map ] && rm /tmp/dev.map - /sbin/grub --no-floppy --device-map /tmp/dev.map >/tmp/grub.log 2>&1 <<EOF + /usr/bin/grub --no-floppy --device-map /tmp/dev.map >/tmp/grub.log 2>&1 <<EOF quit EOF } @@ -159,9 +159,9 @@ dogrub() { sync # freeze xfs filesystems to enable grub installation on xfs filesystems - if [ -x /usr/sbin/xfs_freeze ]; then - [ "$(stat -fLc %T /boot)" == "xfs" ] && /usr/sbin/xfs_freeze -f /boot > /dev/null 2>&1 - [ "$(stat -fLc %T /)" == "xfs" ] && /usr/sbin/xfs_freeze -f / > /dev/null 2>&1 + if [ -x /usr/bin/xfs_freeze ]; then + [ "$(stat -fLc %T /boot)" == "xfs" ] && /usr/bin/xfs_freeze -f /boot > /dev/null 2>&1 + [ "$(stat -fLc %T /)" == "xfs" ] && /usr/bin/xfs_freeze -f / > /dev/null 2>&1 fi # look for a separately-mounted /boot partition @@ -178,7 +178,7 @@ dogrub() { echo ${bootpart} echo ${bootdev} - /sbin/grub --no-floppy --batch >/tmp/grub.log 2>&1 <<EOF + /usr/bin/grub --no-floppy --batch >/tmp/grub.log 2>&1 <<EOF root ${bootpart} setup ${bootdev} quit @@ -186,9 +186,9 @@ EOF cat /tmp/grub.log # unfreeze xfs filesystems - if [ -x /usr/sbin/xfs_freeze ]; then - [ "$(stat -fLc %T /boot)" == "xfs" ] && /usr/sbin/xfs_freeze -u /boot > /dev/null 2>&1 - [ "$(stat -fLc %T /)" == "xfs" ] && /usr/sbin/xfs_freeze -u / > /dev/null 2>&1 + if [ -x /usr/bin/xfs_freeze ]; then + [ "$(stat -fLc %T /boot)" == "xfs" ] && /usr/bin/xfs_freeze -u /boot > /dev/null 2>&1 + [ "$(stat -fLc %T /)" == "xfs" ] && /usr/bin/xfs_freeze -u / > /dev/null 2>&1 fi if grep "Error [0-9]*: " /tmp/grub.log >/dev/null; then echo "Error installing GRUB. (see /tmp/grub.log for output)" |