iankelling.org
/
git
/
automated-distro-installer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e6c8a36
)
remove some cruft to make flidas basefile build
author
Ian Kelling
<iank@fsf.org>
Sun, 8 Oct 2017 17:30:47 +0000
(10:30 -0700)
committer
Ian Kelling
<iank@fsf.org>
Sun, 8 Oct 2017 17:30:47 +0000
(10:30 -0700)
fai/config/basefiles/mk-basefile
patch
|
blob
|
history
diff --git
a/fai/config/basefiles/mk-basefile
b/fai/config/basefiles/mk-basefile
index b688a865e985d5a18186c8c7200f1782859957e0..36bacba37985bdf78fe902c978dfae5df0afc9e7 100755
(executable)
--- a/
fai/config/basefiles/mk-basefile
+++ b/
fai/config/basefiles/mk-basefile
@@
-36,9
+36,6
@@
EXCLUDE_TRUSTY=dhcp3-client,dhcp3-common,info
EXCLUDE_FLIDAS=udhcpc,dibbler-client,info,tasksel,tasksel-data
EXCLUDE_XENIAL=udhcpc,dibbler-client,info,tasksel,tasksel-data
EXCLUDE_FLIDAS=udhcpc,dibbler-client,info,tasksel,tasksel-data
EXCLUDE_XENIAL=udhcpc,dibbler-client,info,tasksel,tasksel-data
-# we need aptitude in the base file, since users may want to use it for installing packages
-INCLUDE_DEBIAN=aptitude
-
setarch() {
setarch() {
@@
-179,7
+176,7
@@
debgeneric() {
check
if [ -n "$arch" ]; then
check
if [ -n "$arch" ]; then
- qemu-debootstrap --arch $arch --exclude=${!exc}
--include=${INCLUDE_DEBIAN}
$dist $xtmp $mirror
+ qemu-debootstrap --arch $arch --exclude=${!exc} $dist $xtmp $mirror
target="${target}_${arch^^}"
else
if [[ $DIST =~ 64 ]]; then
target="${target}_${arch^^}"
else
if [[ $DIST =~ 64 ]]; then
@@
-187,7
+184,7
@@
debgeneric() {
else
arch=i386
fi
else
arch=i386
fi
- debootstrap --arch $arch --exclude=${!exc}
--include=${INCLUDE_DEBIAN}
$dist $xtmp $mirror
+ debootstrap --arch $arch --exclude=${!exc} $dist $xtmp $mirror
fi
cleanup-deb
tarit
fi
cleanup-deb
tarit