Skip to content

Commit

Permalink
adjust config examples
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Lange committed Oct 18, 2017
1 parent 795c8ee commit 1878581
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 34 deletions.
12 changes: 6 additions & 6 deletions examples/simple/files/etc/apt/sources.list/GCE
@@ -1,7 +1,7 @@
deb {apt_cdn}/debian {release} main contrib non-free
deb {apt_cdn}/debian {release}-backports main
deb {apt_cdn}/debian-security {release}/updates main contrib non-free
deb {%apt_cdn%}/debian {%release%} main contrib non-free
deb {%apt_cdn%}/debian {%release%}-backports main
deb {%apt_cdn%}/debian-security {%release%}/updates main contrib non-free

deb http://packages.cloud.google.com/apt cloud-sdk-{release} main
deb http://packages.cloud.google.com/apt google-cloud-packages-archive-keyring-{release} main
deb http://packages.cloud.google.com/apt google-cloud-compute-{release} main
deb http://packages.cloud.google.com/apt cloud-sdk-{%release%} main
deb http://packages.cloud.google.com/apt google-cloud-packages-archive-keyring-{%release%} main
deb http://packages.cloud.google.com/apt google-cloud-compute-{%release%} main
4 changes: 2 additions & 2 deletions examples/simple/files/etc/apt/sources.list/GNOME
@@ -1,2 +1,2 @@
deb {apt_cdn}/debian stretch main contrib non-free
deb {apt_cdn}/debian-security stretch/updates main contrib non-free
deb {%apt_cdn%}/debian stretch main contrib non-free
deb {%apt_cdn%}/debian-security stretch/updates main contrib non-free
23 changes: 0 additions & 23 deletions examples/simple/files/etc/apt/sources.list/preinst

This file was deleted.

4 changes: 2 additions & 2 deletions examples/simple/scripts/FAISERVER/10-conffiles
@@ -1,7 +1,7 @@
#! /bin/bash

fcopy -Bvr /etc/fai
fcopy -Bv /etc/fai/apt/sources.list /etc/dhcp/dhcpd.conf
fcopy -BvrS /etc/fai
fcopy -BvS /etc/fai/apt/sources.list /etc/dhcp/dhcpd.conf

if [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ] ; then

Expand Down
2 changes: 1 addition & 1 deletion examples/simple/scripts/LAST/50-misc
Expand Up @@ -58,7 +58,7 @@ if [ $FAI_ACTION = "install" ]; then
fi

# copy sources.list
fcopy -iM /etc/apt/sources.list
fcopy -iSM /etc/apt/sources.list


setrel() {
Expand Down

0 comments on commit 1878581

Please sign in to comment.