iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update to db59a1a2dd 2019-03-07
[automated-distro-installer]
/
fai
/
config
/
basefiles
/
mk-basefile
diff --git
a/fai/config/basefiles/mk-basefile
b/fai/config/basefiles/mk-basefile
index 2fc0d2ace513f27ed08439c51521585a099ff107..deb12d4e59678407166e723095ec32e3fa0fc429 100755
(executable)
--- a/
fai/config/basefiles/mk-basefile
+++ b/
fai/config/basefiles/mk-basefile
@@
-174,6
+174,7
@@
debgeneric() {
dist=${DIST%%[0-9][0-9]}
local exc="EXCLUDE_$dist"
dist=${DIST%%[0-9][0-9]}
local exc="EXCLUDE_$dist"
+ [ -n "${!exc}" ] && exc="--exclude=${!exc}" || unset exc
dist=${dist,,}
check
dist=${dist,,}
check
@@
-182,7
+183,7
@@
debgeneric() {
fi
if [ -n "$arch" ]; then
fi
if [ -n "$arch" ]; then
- qemu-debootstrap --arch $arch
--exclude=${!
exc} $inc $dist $xtmp $mirror
+ qemu-debootstrap --arch $arch
${
exc} $inc $dist $xtmp $mirror
target="${target}_${arch^^}"
else
if [[ $DIST =~ 64 ]]; then
target="${target}_${arch^^}"
else
if [[ $DIST =~ 64 ]]; then
@@
-190,7
+191,7
@@
debgeneric() {
else
arch=i386
fi
else
arch=i386
fi
- debootstrap --arch $arch
--exclude=${!
exc} $inc $dist $xtmp $mirror
+ debootstrap --arch $arch
${
exc} $inc $dist $xtmp $mirror
fi
cleanup-deb
tarit
fi
cleanup-deb
tarit