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
various fixes, make settable basefile dir
[automated-distro-installer]
/
fai
/
config
/
basefiles
/
mk-basefile
diff --git
a/fai/config/basefiles/mk-basefile
b/fai/config/basefiles/mk-basefile
index b93831ca3493a506c1040149a1b32e2dfd1b2a29..8f2bd4aaf78c4e253c9d64b69edbd0e6b1a7d55e 100755
(executable)
--- a/
fai/config/basefiles/mk-basefile
+++ b/
fai/config/basefiles/mk-basefile
@@
-1,5
+1,4
@@
#! /bin/bash
#! /bin/bash
-
# mk-basefile, create basefiles for some distributions
#
# Thomas Lange, Uni Koeln, 2011-2017
# mk-basefile, create basefiles for some distributions
#
# Thomas Lange, Uni Koeln, 2011-2017
@@
-22,6
+21,7
@@
# For the first stage, set the CentOS/SLC mirror in /etc/rinse/rinse.conf
MIRROR_DEBIAN=http://deb.debian.org/debian/
MIRROR_UBUNTU=http://mirror.netcologne.de/ubuntu/
# For the first stage, set the CentOS/SLC mirror in /etc/rinse/rinse.conf
MIRROR_DEBIAN=http://deb.debian.org/debian/
MIRROR_UBUNTU=http://mirror.netcologne.de/ubuntu/
+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
MIRROR_CENTOS=http://mirror.netcologne.de/
EXCLUDE_SQUEEZE=isc-dhcp-client,isc-dhcp-common,info,tasksel,tasksel-data
@@
-30,12
+30,11
@@
EXCLUDE_JESSIE=info,tasksel,tasksel-data
EXCLUDE_STRETCH=info,tasksel,tasksel-data
EXCLUDE_BUSTER=tasksel,tasksel-data
EXCLUDE_STRETCH=info,tasksel,tasksel-data
EXCLUDE_BUSTER=tasksel,tasksel-data
+EXCLUDE_BELENOS=dhcp3-client,dhcp3-common,info
EXCLUDE_TRUSTY=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,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() {
@@
-102,6
+101,14
@@
EOM
cleanup-deb() {
cleanup-deb() {
+ if [[ $cmd ]]; then
+ if [[ -e $cmd ]]; then
+ cp "$cmd" $xtmp/tmp
+ chroot $xtmp "/tmp/$cmd"
+ else
+ chroot $xtmp $cmd
+ fi
+ fi
chroot $xtmp apt-get clean
rm -f $xtmp/etc/hostname $xtmp/etc/resolv.conf \
$xtmp/var/lib/apt/lists/*_* $xtmp/usr/bin/qemu-*-static \
chroot $xtmp apt-get clean
rm -f $xtmp/etc/hostname $xtmp/etc/resolv.conf \
$xtmp/var/lib/apt/lists/*_* $xtmp/usr/bin/qemu-*-static \
@@
-176,7
+183,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
@@
-184,7
+191,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
@@
-226,6
+233,8
@@
Usage: mk-basefile [OPTION] ... DISTRIBUTION
-z Use gzip for compressing the tar file.
-J Use xz for compressing the tar file.
-k Keep the temporary subtree structure, do not remove it.
-z Use gzip for compressing the tar file.
-J Use xz for compressing the tar file.
-k Keep the temporary subtree structure, do not remove it.
+ -x CMD Run CMD in chroot. If CMD exists as a file, copy it and run it.
+ Debian based only
-h Print help.
Usage example: mk-basefile -J STRETCH64
-h Print help.
Usage example: mk-basefile -J STRETCH64
@@
-241,8
+250,9
@@
ext=tar
zip=cat
attributes=
cleanup=1
zip=cat
attributes=
cleanup=1
+cmd=
-while getopts ashzJd:kf: opt ; do
+while getopts ashzJd:kf:
x:
opt ; do
case "$opt" in
a) attributes="--xattrs --selinux --acl" ;;
d) export TMPDIR=$OPTARG ;;
case "$opt" in
a) attributes="--xattrs --selinux --acl" ;;
d) export TMPDIR=$OPTARG ;;
@@
-252,6
+262,7
@@
while getopts ashzJd:kf: opt ; do
k) cleanup=0 ;;
h) usage ;;
s) prtdists ; exit 0;;
k) cleanup=0 ;;
h) usage ;;
s) prtdists ; exit 0;;
+ x) cmd="$OPTARG" ;;
?) exit 3 ;; # error in option parsing
esac
done
?) exit 3 ;; # error in option parsing
esac
done
@@
-279,6
+290,8
@@
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*)
+ debgeneric $target $MIRROR_TRISQUEL ;;
TRUSTY*|XENIAL*)
debgeneric $target $MIRROR_UBUNTU ;;
SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*|BUSTER*)
TRUSTY*|XENIAL*)
debgeneric $target $MIRROR_UBUNTU ;;
SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*|BUSTER*)