summaryrefslogtreecommitdiff
path: root/pcr/grub-legacy/install-grub
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-11-08 03:36:19 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-11-08 03:36:19 -0200
commit5c230a8b1124d903bc481ec6753d5503725bdafe (patch)
tree5f8d5dc49dc8b410d32f16c02f02f0c55741bdcb /pcr/grub-legacy/install-grub
parent8dc929d1708345d981ae3ab980f1e6acb9f91542 (diff)
parent07cc5b5f7eb1a1b8408d7b7edb0656dc131b5e84 (diff)
downloadabslibre-5c230a8b1124d903bc481ec6753d5503725bdafe.tar.gz
abslibre-5c230a8b1124d903bc481ec6753d5503725bdafe.tar.bz2
abslibre-5c230a8b1124d903bc481ec6753d5503725bdafe.zip
Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre
Diffstat (limited to 'pcr/grub-legacy/install-grub')
-rw-r--r--pcr/grub-legacy/install-grub16
1 files changed, 8 insertions, 8 deletions
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)"