summaryrefslogtreecommitdiff
path: root/conf/distro/include/freeze.inc
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-02-08 16:25:39 +0000
committerRod Whitby <rod@whitby.id.au>2007-02-08 16:25:39 +0000
commit34cea0ff78182315ff4049d03af223a8d445e847 (patch)
treeae4a8bde9abc2ca42e4eb12bf6833cdbce2eef21 /conf/distro/include/freeze.inc
parent45802a74a4a83a9523f0423797a1cb1b27345ed8 (diff)
slugos: Removed the obsolete freeze-packages.inc stuff (but left freeze.inc itself there in case any other distro is still using it).
Diffstat (limited to 'conf/distro/include/freeze.inc')
-rw-r--r--conf/distro/include/freeze.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/conf/distro/include/freeze.inc b/conf/distro/include/freeze.inc
index d41cb89111..4c2c8b1e2e 100644
--- a/conf/distro/include/freeze.inc
+++ b/conf/distro/include/freeze.inc
@@ -14,12 +14,10 @@ FROZEN_DIR ?= "/non/-existent/-directory/-for/-security"
# Pull in the frozen definitions (if they exist) The multiple
# includes allow the frozen file to be stored alongside local.conf
-# and in the conf/distro directory - the former take precedence over
-# the latter.
-require conf/distro/include/${DISTRO}-packages.inc
+# and in a distro-specific frozen directory - the former take
+# precedence over the latter.
include conf/${DISTRO}-packages.conf
include ${FROZEN_DIR}/${DISTRO}-packages.conf
-require conf/distro/include/${DISTRO}-bbfiles.inc
include conf/${DISTRO}-bbfiles.conf
include ${FROZEN_DIR}/${DISTRO}-bbfiles.conf