aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-02-15 06:07:36 +0000
committerFrancis Rowe <info@gluglug.org.uk>2015-02-15 06:07:36 +0000
commitf6f17494743976326d151bf866b22b6a1b33d5a7 (patch)
treed6839faec806f4bdaeef1ca449642a0a95466bdc
parent3eac903512ef6bad3b9830cc3774aa7cf7fafdc0 (diff)
downloadlibrebootfr-f6f17494743976326d151bf866b22b6a1b33d5a7.tar.gz
librebootfr-f6f17494743976326d151bf866b22b6a1b33d5a7.zip
grub-background: assume that it is being run from libreboot_util
-rwxr-xr-xgrub-background20
1 files changed, 10 insertions, 10 deletions
diff --git a/grub-background b/grub-background
index 6e0bd4f3..0fb721e8 100755
--- a/grub-background
+++ b/grub-background
@@ -36,19 +36,19 @@ fi
rompath=$1
jpegpath=$2
-path="unknown"
-if [ -f "DEBLOB" ]; then
- path="./coreboot/util/cbfstool/cbfstool"
-elif [ $(uname -i) = "armv7l" ] || [ $(uname -m) = "armv7l" ]; then
- path="./cbfstool/armv7l/cbfstool"
+arch="unknown"
+if [ $(uname -i) = "armv7l" ] || [ $(uname -m) = "armv7l" ]; then
+ arch="armv7l"
elif [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ]; then
- path="./cbfstool/i686/cbfstool"
+ arch="i686"
elif [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ]; then
- path="./cbfstool/x86_64/cbfstool"
+ arch="x86_64"
else
- echo "grub-background script: Unknown host."
+ echo "Unknown host architecture"
exit 1
fi
-$path "$rompath" remove -n background.jpg
-$path "$rompath" add -f "$jpegpath" -n background.jpg -t raw
+cbfstool="./cbfstool/$arch/cbfstool"
+
+$cbfstool "$rompath" remove -n background.jpg
+$cbfstool "$rompath" add -f "$jpegpath" -n background.jpg -t raw