Browse Source

fix use of $chroot

r31463
tags/0.1
Colin Watson 16 years ago
parent
commit
2baaf28d7d
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      apt-setup
  2. +1
    -1
      apt-setup-verify
  3. +2
    -2
      generators/50cdrom

+ 1
- 1
apt-setup View File

@@ -32,7 +32,7 @@ for generator in $gendir/*; do
db_progress INFO apt-setup/progress/fallback
fi
tmp=$($chroot tempfile)
tmp=$($chroot $ROOT tempfile)
echo > $tmp
if $generator $tmp; then
if ! apt-setup-verify $tmp $ROOT/etc/apt/sources.list; then


+ 1
- 1
apt-setup-verify View File

@@ -20,7 +20,7 @@ saveline () {
valid () {
line="$1"

tmp=$($chroot tempfile)
tmp=$($chroot $ROOT tempfile)
echo "$line" > $ROOT$tmp
if $chroot $ROOT apt-get -o APT::Get::List-Cleanup=false \


+ 2
- 2
generators/50cdrom View File

@@ -23,9 +23,9 @@ else
chroot=
fi

tmp=$($chroot tempfile)
tmp=$($chroot $ROOT tempfile)
# apt-cdrom can be interactive, avoid that
$chroot apt-cdrom add \
$chroot $ROOT apt-cdrom add \
-o Dir::Etc::SourceList=$tmp \
-o Acquire::gpgv::Options::=--ignore-time-conflict \
</dev/null

Loading…
Cancel
Save