From 4bc574e7d476abde7c9d8d38e1d749e2c8eb67e6 Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Mon, 14 Mar 2011 21:52:57 +0100 Subject: [PATCH] Assume 'squeeze' as default SUITE. --- docs/grml-live.txt | 14 +++++++------- etc/grml/fai/make-fai-nfsroot.conf | 2 +- etc/grml/grml-live.conf | 8 ++++---- grml-live | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/grml-live.txt b/docs/grml-live.txt index dcfb14b..8f7946f 100644 --- a/docs/grml-live.txt +++ b/docs/grml-live.txt @@ -168,8 +168,8 @@ Specify name of the release. -s **SUITE**:: Specify the Debian suite you want to use for your live-system. Defaults to -"lenny" (being current Debian/stable). Supported values are: etch, lenny, sid. -Debian "squeeze" (current Debian/testing) requires base.tgz +"squeeze" (being current Debian/stable). Supported values are: etch, lenny, +squeeze, sid. Debian "squeeze" requires a recent base.tgz (/etc/grml/fai/config/basefiles/$CLASSNAME.tar.gz) or a recent version of debootstrap. @@ -947,7 +947,7 @@ How do I create a base.tgz for use as NFSROOT? First of all build the chroot system: mkdir /tmp/nfsroot && cd /tmp/nfsroot - debootstrap lenny /tmp/nfsroot/ http://cdn.debian.net/debian + debootstrap squeeze /tmp/nfsroot/ http://cdn.debian.net/debian tar zcf base.tgz ./ Then check out where your NFSROOT is located: @@ -996,10 +996,10 @@ FAI_DEBOOTSTRAP: GRML_LIVE_SOURCES=" deb http://localhost:3142/deb.grml.org grml-stable main deb http://localhost:3142/deb.grml.org grml-testing main - deb http://localhost:3142/cdn.debian.net/debian lenny main contrib non-free + deb http://localhost:3142/cdn.debian.net/debian squeeze main contrib non-free " [...] - FAI_DEBOOTSTRAP="lenny http://localhost:3142/cdn.debian.net/debian lenny main contrib non-free" + FAI_DEBOOTSTRAP="squeeze http://localhost:3142/cdn.debian.net/debian squeeze main contrib non-free" Make sure apt-cacher / apt-cacher-ng is running ('/etc/init.d/apt-cacher restart' or '/etc/init.d/apt-cacher-ng restart'). That's it. All downloaded @@ -1017,9 +1017,9 @@ FAI_DEBOOTSTRAP: GRML_LIVE_SOURCES=" deb http://localhost:9999/grml grml-stable main deb http://localhost:9999/grml grml-testing main - deb http://localhost:9999/debian lenny main contrib non-free + deb http://localhost:9999/debian squeeze main contrib non-free " - FAI_DEBOOTSTRAP="lenny http://localhost:9999/debian" + FAI_DEBOOTSTRAP="squeeze http://localhost:9999/debian" Configure approx: diff --git a/etc/grml/fai/make-fai-nfsroot.conf b/etc/grml/fai/make-fai-nfsroot.conf index cfd1e79..ace53d9 100644 --- a/etc/grml/fai/make-fai-nfsroot.conf +++ b/etc/grml/fai/make-fai-nfsroot.conf @@ -16,7 +16,7 @@ TFTPROOT=/srv/tftp/fai #NFSROOT_ETC_HOSTS="192.168.1.250 yourinstallserver" # debootstrap commandline -FAI_DEBOOTSTRAP="lenny http://cdn.debian.net/debian" +FAI_DEBOOTSTRAP="squeeze http://cdn.debian.net/debian" # which options do you want to use for debootstrap? FAI_DEBOOTSTRAP_OPTS="--exclude=info,tasksel,tasksel-data" diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf index 30b508c..659e22c 100644 --- a/etc/grml/grml-live.conf +++ b/etc/grml/grml-live.conf @@ -45,11 +45,11 @@ # Default: unset (so do not remove the logfile(s)) # ZERO_FAI_LOGFILE='1' -# Which Debian suite to you want to use? Unless it is set it defaults to "lenny" -# Supported values are: etch, lenny, sid +# Which Debian suite to you want to use? Unless it is set it defaults to "squeeze" +# Supported values are: etch, lenny, sid, # squeeze -> requires /etc/grml/fai/config/basefiles/....tar.gz # or a recent version of debootstrap -# SUITE="lenny" +# SUITE="squeeze" # Which FAI classes do you want to use by default?# @@ -81,7 +81,7 @@ # taken. If you specify a value then the file /etc/grml/fai/make-fai-nfsroot.conf # will be updated by grml-live on-the-fly. # Usage: " " -# FAI_DEBOOTSTRAP="lenny http://cdn.debian.net/debian" +# FAI_DEBOOTSTRAP="squeeze http://cdn.debian.net/debian" # Do you want to use a local mirror (like NFS) as well? # If so specify the directory where debian/ is available: diff --git a/grml-live b/grml-live index ef182df..ff15b56 100755 --- a/grml-live +++ b/grml-live @@ -257,7 +257,7 @@ shift $(($OPTIND - 1)) # set ARGV to the first not parsed commandline parameter [ -n "$NFSROOT_CONF" ] || NFSROOT_CONF='/etc/grml/fai/make-fai-nfsroot.conf' [ -n "$RELEASENAME" ] || RELEASENAME='grml-live rocks' [ -n "$SQUASHFS_EXCLUDES_FILE " ] || SQUASHFS_EXCLUDES_FILE='/etc/grml/fai/squashfs-excludes' -[ -n "$SUITE" ] || SUITE='lenny' +[ -n "$SUITE" ] || SUITE='squeeze' [ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates' [ -n "$USERNAME" ] || USERNAME='grml' [ -n "$VERSION" ] || VERSION='0.0.1' -- 2.1.4