2010-01-28 Christian Schmitt <chris@ilovelinux.de>

* util/ieee1275/grub-install.in: Fix nvsetenv arguments.
This commit is contained in:
Christian Schmitt 2010-01-28 23:10:37 +01:00 committed by Vladimir 'phcoder' Serbinenko
parent 1136ac2632
commit bf7fcba2d7
2 changed files with 9 additions and 5 deletions

View file

@ -1,3 +1,7 @@
2010-01-28 Christian Schmitt <chris@ilovelinux.de>
* util/ieee1275/grub-install.in: Fix nvsetenv arguments.
2010-01-28 BVK Chaitanya <bvk.groups@gmail.com> 2010-01-28 BVK Chaitanya <bvk.groups@gmail.com>
* include/grub/script_sh.h (sourcecode): Add const qualifier. * include/grub/script_sh.h (sourcecode): Add const qualifier.

View file

@ -46,8 +46,8 @@ install_device=
debug=no debug=no
update_nvram=yes update_nvram=yes
ofpathname=/usr/sbin/ofpathname ofpathname=`which ofpathname`
nvsetenv=/sbin/nvsetenv nvsetenv=`which nvsetenv`
# Usage: usage # Usage: usage
# Print the usage. # Print the usage.
@ -216,11 +216,11 @@ if test $update_nvram = yes; then
} }
# Point boot-device at the new grub install # Point boot-device at the new grub install
boot_device="boot-device $ofpath:$partno,\\grub" boot_device="$ofpath:$partno,\\grub"
"$nvsetenv" "$boot_device" || { "$nvsetenv" boot-device "$boot_device" || {
echo "$nvsetenv failed." echo "$nvsetenv failed."
echo "You will have to set boot-device manually. At the Open Firmware prompt, type:" echo "You will have to set boot-device manually. At the Open Firmware prompt, type:"
echo " setenv $boot_device" echo " setenv boot-device $boot_device"
exit 1 exit 1
} }
fi fi