Warning!

Notice: the grml team is migrating from Mercurial to Git.
Please visit git.grml.org instead!

Try to automate grml-live pool handling
authorMichael Prokop
Thu Oct 25 09:54:00 2007 +0200 (13 months ago)
changeset 2149a8271bc51fc
manifest9a8271bc51fc
parent 2139c5a9f528dbf
child 215e29929175f5f
Try to automate grml-live pool handling
debian/changelog
etc/grml/fai/apt/sources.list
etc/grml/grml-live.conf
grml-live
--- a/debian/changelog Thu Oct 25 09:26:10 2007 +0200
+++ b/debian/changelog Thu Oct 25 09:54:00 2007 +0200
@@ -9,7 +9,9 @@ grml-live (0.0.7) unstable; urgency=low
- buildd/functions.sh: do not mv files if there was an error
during grml-live execution
* Added new grml-repository named grml-live which is intented
- to fix issues from Debian for grml-live builds.
+ to fix issues from Debian for grml-live builds. It is automatically
+ activated if you are building against unstable/sid and should
+ be used manually only if you realy know what you are doing. :)
* Use apt-pinning via /etc/grml/fai/config/hooks/instsoft.GRMLBASE
already and remove it from /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
* Display version number of grml-live.
--- a/etc/grml/fai/apt/sources.list Thu Oct 25 09:26:10 2007 +0200
+++ b/etc/grml/fai/apt/sources.list Thu Oct 25 09:54:00 2007 +0200
@@ -1,4 +1,3 @@ deb http://deb.grml.org/ grml
deb http://deb.grml.org/ grml-stable main
deb http://deb.grml.org/ grml-testing main
-deb http://deb.grml.org/ grml-live main
deb http://ftp.de.debian.org/debian etch main contrib non-free
--- a/etc/grml/grml-live.conf Thu Oct 25 09:26:10 2007 +0200
+++ b/etc/grml/grml-live.conf Thu Oct 25 09:54:00 2007 +0200
@@ -44,7 +44,6 @@ CLASSES="GRMLBASE,GRML_MEDIUM,I386"
#deb http://192.168.1.112/debian etch main contrib non-free
#deb http://deb.grml.org/ grml-stable main
#deb http://deb.grml.org/ grml-testing main
-#deb http://deb.grml.org/ grml-live main
#deb http://ftp.de.debian.org/debian etch main contrib non-free
#"
--- a/grml-live Thu Oct 25 09:26:10 2007 +0200
+++ b/grml-live Thu Oct 25 09:54:00 2007 +0200
@@ -252,6 +252,11 @@ if [ -n "$SUITE" ] ; then
DIST="\|\ etch\ \|\ stable\ \|\ lenny\ \|\ testing\ \|\ sid\ \|\ unstable\ "
sed -i "s/\(deb .\+\)\([ \t]+\)$DIST\([ \t]+\)\(main \)/\1\2 $SUITE \3\4/" $LIVE_CONF
sed -i "s/\(deb .\+\)\([ \t]+\)$DIST\([ \t]+\)\(main \)/\1\2 $SUITE \3\4/" /etc/grml/fai/apt/sources.list
+ # notice: activate grml-live pool only if we are building against unstable:
+ if grep -qe unstable -qe sid /etc/grml/fai/apt/sources.list ; then
+ grep grml-stable /etc/grml/fai/apt/sources.list | \
+ sed 's/grml-stable/grml-live/' >> /etc/grml/fai/apt/sources.list
+ fi
sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" $LIVE_CONF
sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" $NFSROOT_CONF