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
changes for trisquel 9
[automated-distro-installer]
/
fai
/
config
/
basefiles
/
mk-basefile
diff --git
a/fai/config/basefiles/mk-basefile
b/fai/config/basefiles/mk-basefile
index ccfd3677ec218fb7086eec123a33d7e6a2adc3ba..b9b67f5ca18bd18a1487f17f5a084e07d953cdf4 100755
(executable)
--- a/
fai/config/basefiles/mk-basefile
+++ b/
fai/config/basefiles/mk-basefile
@@
-1,8
+1,7
@@
#! /bin/bash
#! /bin/bash
-set -x
# mk-basefile, create basefiles for some distributions
#
# mk-basefile, create basefiles for some distributions
#
-# Thomas Lange, Uni Koeln, 2011-201
7
+# Thomas Lange, Uni Koeln, 2011-201
8
# based on the Makefile implementation of Michael Goetze
#
# Usage example: mk-basefile -J STRETCH64
# based on the Makefile implementation of Michael Goetze
#
# Usage example: mk-basefile -J STRETCH64
@@
-25,17
+24,23
@@
MIRROR_UBUNTU=http://mirror.netcologne.de/ubuntu/
MIRROR_TRISQUEL=http://mirror.fsf.org/trisquel/
MIRROR_CENTOS=http://mirror.netcologne.de/
MIRROR_TRISQUEL=http://mirror.fsf.org/trisquel/
MIRROR_CENTOS=http://mirror.netcologne.de/
-EXCLUDE_SQUEEZE=isc-dhcp-client,isc-dhcp-common,info,tasksel,tasksel-data
-EXCLUDE_WHEEZY=info,tasksel,tasksel-data
-EXCLUDE_JESSIE=info,tasksel,tasksel-data
-EXCLUDE_STRETCH=info,tasksel,tasksel-data
-EXCLUDE_BUSTER=tasksel,tasksel-data
+EXCLUDE_SQUEEZE=isc-dhcp-client,isc-dhcp-common,info
+EXCLUDE_WHEEZY=info
+EXCLUDE_JESSIE=info
+EXCLUDE_STRETCH=info
+EXCLUDE_BUSTER=info
+EXCLUDE_SID=
EXCLUDE_BELENOS=dhcp3-client,dhcp3-common,info
EXCLUDE_TRUSTY=dhcp3-client,dhcp3-common,info
EXCLUDE_BELENOS=dhcp3-client,dhcp3-common,info
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_XENIAL=udhcpc,dibbler-client,info
+EXCLUDE_FLIDAS=udhcpc,dibbler-client,info
+EXCLUDE_BIONIC=udhcpc,dibbler-client,info
+EXCLUDE_ETIONA=udhcpc,dibbler-client,info
+# here you can add packages, that are needed very early
+INCLUDE_DEBIAN=
+INCLUDE_ETIONA=ifupdown
setarch() {
setarch() {
@@
-180,11
+185,15
@@
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
+ local inc="INCLUDE_$dist"
+ [ -n "${!inc}" ] && inc="--include=${!inc}" || unset inc
dist=${dist,,}
check
dist=${dist,,}
check
+
if [ -n "$arch" ]; then
if [ -n "$arch" ]; then
- qemu-debootstrap --arch $arch
--exclude=${!exc}
$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
@@
-192,7
+201,7
@@
debgeneric() {
else
arch=i386
fi
else
arch=i386
fi
- debootstrap --arch $arch
--exclude=${!exc}
$dist $xtmp $mirror
+ debootstrap --arch $arch
${exc} $inc
$dist $xtmp $mirror
fi
cleanup-deb
tarit
fi
cleanup-deb
tarit
@@
-210,11
+219,15
@@
prtdists() {
SLC7_64
TRUSTY32 TRUSTY64
XENIAL32 XENIAL64
SLC7_64
TRUSTY32 TRUSTY64
XENIAL32 XENIAL64
+ FLIDAS64
+ BIONIC64
+ ETIONA64
SQUEEZE32 SQUEEZE64
WHEEZY32 WHEEZY64
JESSIE32 JESSIE64
STRETCH32 STRETCH64
BUSTER32 BUSTER64
SQUEEZE32 SQUEEZE64
WHEEZY32 WHEEZY64
JESSIE32 JESSIE64
STRETCH32 STRETCH64
BUSTER32 BUSTER64
+ SID32 SID64
"
}
"
}
@@
-223,12
+236,11
@@
usage() {
cat <<EOF
mk-basefile, create minimal base files for a Linux distritubtion
cat <<EOF
mk-basefile, create minimal base files for a Linux distritubtion
- Copyright (C) 2011-201
7
by Thomas Lange
+ Copyright (C) 2011-201
8
by Thomas Lange
Usage: mk-basefile [OPTION] ... DISTRIBUTION
-s Show list of supported linux distributions
Usage: mk-basefile [OPTION] ... DISTRIBUTION
-s Show list of supported linux distributions
- -a Add xtattrs, acl and selinux properties to the tar file.
-f ARCH Build for foreign architecture ARCH.
-d DIR Use DIR for creating the temporary subtree structure.
-z Use gzip for compressing the tar file.
-f ARCH Build for foreign architecture ARCH.
-d DIR Use DIR for creating the temporary subtree structure.
-z Use gzip for compressing the tar file.
@@
-251,11
+263,11
@@
ext=tar
zip=cat
attributes=
cleanup=1
zip=cat
attributes=
cleanup=1
-cmd=
+attributes="--xattrs --selinux --acls"
while getopts ashzJd:kf:x: opt ; do
case "$opt" in
while getopts ashzJd:kf:x: opt ; do
case "$opt" in
- a)
attributes="--xattrs --selinux --acl
" ;;
+ a)
echo "$0: Warning. -a is ignored, because xtattrs, acls and selinux are always added.
" ;;
d) export TMPDIR=$OPTARG ;;
f) export ARCH=$OPTARG ;;
z) zip="gzip -9"; ext=tar.gz ;;
d) export TMPDIR=$OPTARG ;;
f) export ARCH=$OPTARG ;;
z) zip="gzip -9"; ext=tar.gz ;;
@@
-291,11
+303,11
@@
case "$target" in
SLC6_32) slc i386 6 ;;
SLC6_64) slc amd64 6 ;;
SLC7_64) slc amd64 7 ;;
SLC6_32) slc i386 6 ;;
SLC6_64) slc amd64 6 ;;
SLC7_64) slc amd64 7 ;;
- BELENOS*|FLIDAS*)
+ BELENOS*|FLIDAS*
|ETIONA*
)
debgeneric $target $MIRROR_TRISQUEL ;;
debgeneric $target $MIRROR_TRISQUEL ;;
- TRUSTY*|XENIAL*)
+ TRUSTY*|XENIAL*
|BIONIC*
)
debgeneric $target $MIRROR_UBUNTU ;;
debgeneric $target $MIRROR_UBUNTU ;;
- SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*|BUSTER*)
+ SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*|BUSTER*
|SID*
)
debgeneric $target $MIRROR_DEBIAN $ARCH;;
*) echo "Unknown distribution. Aborting."
prtdists
debgeneric $target $MIRROR_DEBIAN $ARCH;;
*) echo "Unknown distribution. Aborting."
prtdists