Skip to content

Commit

Permalink
jessie -> stretch
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Lange committed Jan 4, 2017
1 parent 9fad7cf commit 1aade7d
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion bin/fai-mirror
Expand Up @@ -279,7 +279,7 @@ DebIndices: Packages Release . .xz
Description: FAI packages from author's repository
Label: fai-project.org
Origin: Original FAI archive
Suite: jessie
Suite: stretch
EOF
# '

Expand Down
2 changes: 1 addition & 1 deletion conf/nfsroot.conf
@@ -1,7 +1,7 @@
# For a detailed description see nfsroot.conf(5)

# "<suite> <mirror>" for debootstrap
FAI_DEBOOTSTRAP="jessie http://httpredir.debian.org/debian"
FAI_DEBOOTSTRAP="stretch http://httpredir.debian.org/debian"
FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'

NFSROOT=/srv/fai/nfsroot
Expand Down
8 changes: 4 additions & 4 deletions conf/sources.list
@@ -1,7 +1,7 @@
# These lines should work for many sites

deb http://httpredir.debian.org/debian jessie main contrib non-free
deb http://security.debian.org/debian-security jessie/updates main contrib non-free
deb http://httpredir.debian.org/debian stretch main contrib non-free
deb http://security.debian.org/debian-security stretch/updates main contrib non-free

# repository that may contain newer fai packages for jessie
#deb [trusted=yes] http://fai-project.org/download jessie koeln
# repository that may contain newer fai packages for stretch
#deb [trusted=yes] http://fai-project.org/download stretch koeln
2 changes: 1 addition & 1 deletion examples/simple/class/GCE.var
@@ -1,4 +1,4 @@
release=jessie
release=stretch
TIMEZONE=UTC
NTPSRVS='metadata.google.internal'
NIC1=eth0
4 changes: 2 additions & 2 deletions examples/simple/files/etc/apt/sources.list/GNOME
@@ -1,2 +1,2 @@
deb http://httpredir.debian.org/debian jessie main contrib non-free
deb http://httpredir.debian.org/debian-security jessie/updates main contrib non-free
deb http://httpredir.debian.org/debian stretch main contrib non-free
deb http://httpredir.debian.org/debian-security stretch/updates main contrib non-free
8 changes: 4 additions & 4 deletions examples/simple/files/etc/fai/apt/sources.list/FAISERVER
@@ -1,5 +1,5 @@
deb http://httpredir.debian.org/debian jessie main contrib non-free
deb http://security.debian.org/debian-security jessie/updates main contrib non-free
deb http://httpredir.debian.org/debian stretch main contrib non-free
deb http://security.debian.org/debian-security stretch/updates main contrib non-free

# repository that may contain newer fai packages for jessie
deb [trusted=yes] http://fai-project.org/download jessie koeln
# repository that may contain newer fai packages for stretch
deb [trusted=yes] http://fai-project.org/download stretch koeln
2 changes: 1 addition & 1 deletion examples/simple/files/etc/fai/nfsroot.conf/FAISERVER
@@ -1,7 +1,7 @@
# For a detailed description see nfsroot.conf(5)

# "<suite> <mirror>" for debootstrap
FAI_DEBOOTSTRAP="jessie http://httpredir.debian.org/debian"
FAI_DEBOOTSTRAP="stretch http://httpredir.debian.org/debian"
FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'

NFSROOT=/srv/fai/nfsroot
Expand Down
2 changes: 1 addition & 1 deletion examples/simple/files/etc/rc.local/FAISERVER
Expand Up @@ -82,7 +82,7 @@ EOF
fai-chboot -o default

# create a template for booting the installation
fai-chboot -Iv -f verbose,sshd,createvt,menu -u nfs://faiserver/srv/fai/config jessie.tmpl
fai-chboot -Iv -f verbose,sshd,createvt,menu -u nfs://faiserver/srv/fai/config stretch.tmpl

# Since we do not know the MAC address, our DHCP cannot provide the hostname.
# Therefore we do explicitly set the hostname
Expand Down
2 changes: 1 addition & 1 deletion examples/simple/scripts/LAST/50-misc
Expand Up @@ -70,7 +70,7 @@ setrel() {
return
fi

dists="jessie stretch xenial trusty"
dists="jessie stretch buster xenial trusty"
for d in $dists; do
if grep -iq $d $target/etc/os-release; then
release=$d
Expand Down
4 changes: 2 additions & 2 deletions utils/mkdebmirror
Expand Up @@ -23,7 +23,7 @@ excl=--exclude='-dbg_'

debug="$@"
arch=amd64
dist=jessie
dist=stretch

destdir=/files/scratch/debmirror
sect="--section main,contrib,non-free"
Expand All @@ -38,4 +38,4 @@ update_from httpredir.debian.org --getcontents $*

# even one should not mirror the security site, but I will do it.
echo "------------------ create mirror for debian-security ------------------"
debmirror $excl $destdir/debian-security $allopt --host=security.debian.org -r debian-security $sect -d jessie/updates $*
debmirror $excl $destdir/debian-security $allopt --host=security.debian.org -r debian-security $sect -d stretch/updates $*

0 comments on commit 1aade7d

Please sign in to comment.