[Fai-commit] r4044 - in people/lazyboy/fai-distributions: .
classes/MANDRIVA/hooks debian etc sbin
fai-commit at lists.alioth.debian.org
fai-commit at lists.alioth.debian.org
Sat Sep 30 13:50:49 UTC 2006
Author: lazyboy-guest
Date: 2006-09-30 13:50:49 +0000 (Sat, 30 Sep 2006)
New Revision: 4044
Modified:
people/lazyboy/fai-distributions/Makefile
people/lazyboy/fai-distributions/classes/MANDRIVA/hooks/instsoft.MANDRIVA
people/lazyboy/fai-distributions/classes/MANDRIVA/hooks/prepareapt.MANDRIVA
people/lazyboy/fai-distributions/debian/changelog
people/lazyboy/fai-distributions/etc/debian_etch.conf
people/lazyboy/fai-distributions/etc/ubuntu_breezy.conf
people/lazyboy/fai-distributions/sbin/fai-make-base-tgz
Log:
add stuff to build debian etch base image on a non-etch server, make some mandriva stuff better
Modified: people/lazyboy/fai-distributions/Makefile
===================================================================
--- people/lazyboy/fai-distributions/Makefile 2006-09-27 14:53:13 UTC (rev 4043)
+++ people/lazyboy/fai-distributions/Makefile 2006-09-30 13:50:49 UTC (rev 4044)
@@ -31,6 +31,8 @@
#cd bin ; install * $(DESTDIR)/usr/bin
cp -a classes $(DOCDIR)
cp -a dists/* $(LIBDIR)
+ cp -a sbin/* $(SBINDIR)
+
# FIXME: those links don't work anyway... fix then re-enable the links
#for dist in `ls dists`; do \
ln -s /usr/lib/$(PACKAGENAME)/$$dist/make-base-tgz $(DESTDIR)/usr/sbin/make-$$dist-base-tgz; \
Modified: people/lazyboy/fai-distributions/classes/MANDRIVA/hooks/instsoft.MANDRIVA
===================================================================
--- people/lazyboy/fai-distributions/classes/MANDRIVA/hooks/instsoft.MANDRIVA 2006-09-27 14:53:13 UTC (rev 4043)
+++ people/lazyboy/fai-distributions/classes/MANDRIVA/hooks/instsoft.MANDRIVA 2006-09-30 13:50:49 UTC (rev 4044)
@@ -138,4 +138,4 @@
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+skiptask instsoft
Modified: people/lazyboy/fai-distributions/classes/MANDRIVA/hooks/prepareapt.MANDRIVA
===================================================================
--- people/lazyboy/fai-distributions/classes/MANDRIVA/hooks/prepareapt.MANDRIVA 2006-09-27 14:53:13 UTC (rev 4043)
+++ people/lazyboy/fai-distributions/classes/MANDRIVA/hooks/prepareapt.MANDRIVA 2006-09-30 13:50:49 UTC (rev 4044)
@@ -18,9 +18,10 @@
fcopy /etc/urpmi/urpmi.cfg
-chroot $FAI_ROOT urpmi.update -f Main
-chroot $FAI_ROOT urpmi.update -f Contrib
-chroot $FAI_ROOT urpmi.update -f Jpackage
+$ROOTCMD urpmi.update -f Main
+$ROOTCMD urpmi.update -f Contrib
+$ROOTCMD urpmi.update -f Jpackage
touch $FAI_ROOT/etc/mtab
touch $FAI_ROOT/var/log/urpmi.log
+skiptask prepareapt
Modified: people/lazyboy/fai-distributions/debian/changelog
===================================================================
--- people/lazyboy/fai-distributions/debian/changelog 2006-09-27 14:53:13 UTC (rev 4043)
+++ people/lazyboy/fai-distributions/debian/changelog 2006-09-30 13:50:49 UTC (rev 4044)
@@ -1,3 +1,15 @@
+fai-distributions (0.1-9) unstable; urgency=low
+
+ * fix packaging error - things work better when we have sbin also
+
+ -- Henning Sprang <henning at sprang.de> Thu, 28 Sep 2006 02:47:14 +0200
+
+fai-distributions (0.1-8) unstable; urgency=low
+
+ * add and fix fai-make-base-tgz for etch (others need to follow)
+
+ -- Henning Sprang <henning at sprang.de> Thu, 28 Sep 2006 02:06:01 +0200
+
fai-distributions (0.1-7) unstable; urgency=low
* fixing tmpdir names
Modified: people/lazyboy/fai-distributions/etc/debian_etch.conf
===================================================================
--- people/lazyboy/fai-distributions/etc/debian_etch.conf 2006-09-27 14:53:13 UTC (rev 4043)
+++ people/lazyboy/fai-distributions/etc/debian_etch.conf 2006-09-30 13:50:49 UTC (rev 4044)
@@ -9,7 +9,7 @@
#BOOTSTRAP_ARCHIVE="http://faiwiki.informatik.uni-koeln.de/download/fai-multi-distribution/bootstrap-archive"
BOOTSTRAP_ARCHIVE="http://ftp.us.debian.org/debian/pool/main/d/debootstrap/"
-DEBOOTSTRAP_DIST_NAME="ecth"
+DEBOOTSTRAP_DIST_NAME="etch"
DEBOOTSTRAP_ARCH="i386"
DEBOOTSTRAP_EXCLUDE="pcmcia-cs,pppoe,dhcp-client,exim4,exim4-base,exim4-config,exim4-daemon-light,modconf,libident,exim"
DEBOOTSTRAP_INCLUDE="lilo"
Modified: people/lazyboy/fai-distributions/etc/ubuntu_breezy.conf
===================================================================
--- people/lazyboy/fai-distributions/etc/ubuntu_breezy.conf 2006-09-27 14:53:13 UTC (rev 4043)
+++ people/lazyboy/fai-distributions/etc/ubuntu_breezy.conf 2006-09-30 13:50:49 UTC (rev 4044)
@@ -1,4 +1,9 @@
-#MIRROR_LOCATION="http://$mirrorhost/ubuntu"
-MIRROR_LOCATION="http://de.archive.ubuntu.com/ubuntu"
+
+# MIRROR_LOCATION: the location of the mirror argument given to debootstrap
+#MIRROR_LOCATION="http://$mirrorhost/debian-etch"
+MIRROR_LOCATION="http://ftp.de.debian.org/debian"
+
+# where to find the deboostrap package
BOOTSTRAP_PACKAGE=debootstrap_0.3.1.6ubuntu1_all.deb
+# wgettable server from which to download the debootstrap package given above
BOOTSTRAP_ARCHIVE="http://faiwiki.informatik.uni-koeln.de/download/fai-multi-distribution/bootstrap-archive"
Modified: people/lazyboy/fai-distributions/sbin/fai-make-base-tgz
===================================================================
--- people/lazyboy/fai-distributions/sbin/fai-make-base-tgz 2006-09-27 14:53:13 UTC (rev 4043)
+++ people/lazyboy/fai-distributions/sbin/fai-make-base-tgz 2006-09-30 13:50:49 UTC (rev 4044)
@@ -51,6 +51,11 @@
exit 6
fi
+if [ ! -d $NFSROOT ]; then
+ echo "need a working nfsroot - run fai-setup or make-fai-nfsroot"
+ exit 1
+fi
+
[ "$verbose" ] && echo "Using configuration files from directory $cfdir"
if [ -n "$cfg" ]; then
. $cfdir/$cfg
@@ -70,13 +75,16 @@
exit 4
fi
-# call debootstrap as neccessary
-# TODO: base bootstrapper dir should be defined in (not yet existing) config
-# file)
+# TODO: base bootstrapper dir should be defined in (not yet existing)
+# generic config file)
BOOTSTRAP_DIR=/var/lib/fai-distributions/bootstrappers/$DISTRIBUTION
-# TODO: cleanup dir if it already exists!
+# cleanup dir if it already exists!
+if [ -d $BOOTSTRAP_DIR ]; then
+ rm -r $BOOTSTRAP_DIR
+fi
+
mkdir -p $BOOTSTRAP_DIR
cd $BOOTSTRAP_DIR
@@ -88,10 +96,22 @@
cd -
+# TODO: put into generic config file
+FAI_TMP_BASEDIR=/tmp/fai/distributions
+
+if [ -d $FAI_TMP_BASEDIR ]; then
+ echo "deleting FAI_TMP_BASEDIR $FAI_TMP_BASEDIR"
+ rm -r $FAI_TMP_BASEDIR
+fi
+
+mkdir -p $FAI_TMP_BASEDIR
+
# TODO: put into (not yet existing)general config file for fai-distributions
-TMP_CHROOT_DIR=`mktemp -d /tmp/fai/${DISTRIBUTION}_debootstrap.XXXXXX`
+TMP_CHROOT_DIR=`mktemp -d $FAI_TMP_BASEDIR/${DISTRIBUTION}_debootstrap.XXXXXX`
+
echo "TMPDIR is $TMP_CHROOT_DIR"
+# call debootstrap as neccessary
# TODO: put into config file (for each distribution)!
DEBOOTSTRAP_OPTIONS="--arch $DEBOOTSTRAP_ARCH \
--exclude=$DEBOOTSTRAP_EXCLUDE \
@@ -112,6 +132,8 @@
echo "Creating base-$DISTRIBUTION.tgz"
cd $TMP_CHROOT_DIR
+
+
tar cfz $NFSROOT/var/tmp/base-$DISTRIBUTION.tgz *
chroot $TMP_CHROOT_DIR umount /dev
More information about the Fai-commit
mailing list