git://git.onelab.eu
/
bootcd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes in the workflow to debug ping-node issues
[bootcd.git]
/
kvariant.sh
diff --git
a/kvariant.sh
b/kvariant.sh
index
f369d28
..
d8fde68
100755
(executable)
--- a/
kvariant.sh
+++ b/
kvariant.sh
@@
-51,14
+51,15
@@
variant=$1; shift
kernelrpm_url=$1; shift
[[ -n "$@" ]] && usage
kernelrpm_url=$1; shift
[[ -n "$@" ]] && usage
-standard_path="/usr/share/bootcd/build"
+basedir=$(cd -P $(dirname $0); pwd)
+standard_path="$basedir/build"
if [ ! -d $standard_path ] ; then
echo "Cound not find standard image $standard_path - exiting"
exit 1
fi
if [ ! -d $standard_path ] ; then
echo "Cound not find standard image $standard_path - exiting"
exit 1
fi
-variant_path=
/usr/share/bootcd/$variant
-if [ -e
$variant_path
] ; then
+variant_path=
"$basedir/$variant"
+if [ -e
"$variant_path"
] ; then
echo "Found $variant_path - please remove first - exiting"
exit 1
fi
echo "Found $variant_path - please remove first - exiting"
exit 1
fi
@@
-114,7
+115,7
@@
mv ${tmpdir}/bootcd.img ${isofsdir}/bootcd.img
echo -n " bootcd.img"
echo ""
echo -n " bootcd.img"
echo ""
-rm -rf $tmpdir
+rm -rf $tmpdir
$kernelrpm
echo "new variant $variant ready"
trap - ERR
echo "new variant $variant ready"
trap - ERR