projects
/
grml-debootstrap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
52e9bbf
)
Source cmdlineopts.clp from same folder as grml-debootstrap file (issue #59)
author
Sebastian Pipping
<sebastian@pipping.org>
Fri, 6 Mar 2015 15:51:06 +0000
(16:51 +0100)
committer
Michael Prokop
<mika@grml.org>
Tue, 10 Mar 2015 14:47:24 +0000
(15:47 +0100)
Simplified, this fixes CVE-2015-1378 for everyone but grml-debootstrap developers.
(cherry picked from commit
7b07013305bea95e8d6db7239c82be09624a11b8
)
grml-debootstrap
patch
|
blob
|
history
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
0a752e7
..
c568b06
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-289,8
+289,9
@@
fi
# cmdline handling {{{
# source external command line parameter-processing script
-if [ -r ./cmdlineopts.clp ] ; then
- . ./cmdlineopts.clp
+self_dir="$(dirname "$(which "$0")")"
+if [ -r "${self_dir}"/cmdlineopts.clp ] ; then
+ . "${self_dir}"/cmdlineopts.clp
elif [ -r /usr/share/grml-debootstrap/functions/cmdlineopts.clp ] ; then
. /usr/share/grml-debootstrap/functions/cmdlineopts.clp
else