From 8ca15982a3387d4fa34e0b78382c8e2f48f3e1e4 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sun, 2 Oct 2005 19:06:34 +0000 Subject: freeze, unfreeze: look for auto.conf as well as local.conf This matches new more recent nslu2 'master makefile' which, by default, does not create local.conf, so freeze/unfreeze fail to find it and put the frozen files in the first directory on the BBPATH (which happens now to be the package directory and therefore does nothing.) --- packages/freeze/files/freeze | 2 +- packages/freeze/files/unfreeze | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/freeze/files/freeze b/packages/freeze/files/freeze index 5305af7191..b92c66054e 100644 --- a/packages/freeze/files/freeze +++ b/packages/freeze/files/freeze @@ -41,7 +41,7 @@ else FROZEN_DIR="" for d in ${BBPATH//:/ } do - if test -r "$d/conf/local.conf" + if test -r "$d/conf/local.conf" -o -r "$d/conf/auto.conf" then FROZEN_DIR="$d/conf" break diff --git a/packages/freeze/files/unfreeze b/packages/freeze/files/unfreeze index 2aaa2ac2fc..5be1459c3c 100644 --- a/packages/freeze/files/unfreeze +++ b/packages/freeze/files/unfreeze @@ -31,7 +31,7 @@ else FROZEN_DIR="" for d in ${BBPATH//:/ } do - if test -r "$d/conf/local.conf" + if test -r "$d/conf/local.conf" -o -r "$d/conf/auto.conf" then FROZEN_DIR="$d/conf" break -- cgit v1.2.3