[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: PPC boot-floppy building



Hmmm. My patch to common.sh which fixes a conflict with apt-get preferences was
screwy. Here's what it should have been. Sorry.

Thanks,

Stephen


Index: common.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/common.sh,v
retrieving revision 1.32
diff -u -u -r1.32 common.sh
--- common.sh  2001/04/08 16:52:51 1.32
+++ common.sh  2001/04/12 17:01:23
@@ -17,6 +17,7 @@
 arch=${architecture-$(dpkg --print-architecture)}

 SOURCES_LIST=${SOURCES_LIST:-$(pwd)/sources.list}
+PREFERENCES_LIST=${PREFERENCES_LIST:-$(pwd)/preferences.apt}

 # abort on any non-zero exit value
 set -e
@@ -224,7 +225,8 @@
     local APT_GET="apt-get $APT_QUIET --yes
         -o Dir::Etc::SourceList=${SOURCES_LIST} \
     -o Debug::NoLocking=true -o Dir::Cache=${archive}/cache \
-        -o Dir::State::status=${DPKG_STATUS} -o
Dir::State::Lists=${archive}/lists"
+        -o Dir::State::status=${DPKG_STATUS} -o
Dir::State::Lists=${archive}/lists \
+    -o Dir::Etc::preferences=${PREFERENCES_LIST}"

     # check if we're in offline mode
     if grep '^offline_mode[[:space:]]*:\?=[[:space:]]*true' config >/dev/null;
then

--
Stephen R. Marenka
<Stephen_R_Marenka@raytheon.com>




Reply to: