Revision 2187080b snf-image-host/common.sh.in

b/snf-image-host/common.sh.in
345 345
EOF
346 346
    chmod +x "$target/usr/sbin/policy-rc.d"
347 347

  
348
   multistrap -d "$target" -a $(dpkg --print-architecture) \
349
        -f "$MULTISTRAP_CONFIG" 2>&1 | sed -u -e 's/^/MULTISTRAP: /g'
350

  
351
   # Save the package list
352
   chroot "$target" dpkg-query -W -f "\${Package}\n" > "$pkgs"
348
   multistrap -d "$target" -f "$MULTISTRAP_CONFIG" 2>&1 | sed -u -e 's/^/MULTISTRAP: /g'
353 349

  
354 350
   rm "$target/usr/sbin/policy-rc.d"
355

  
356
   local tmp_cache=$(mktemp "$cache.XXXXXX")
357
   tar cf "$tmp_cache" --one-file-system -C "$target" . || \
358
        { rm "$tmp_cache"; false; }
359
   # Overwrite the default cache file. Not the user specified if present.
360
   mv -f "$tmp_cache" "$cache"
351
   rm -rf "$target/etc/apt/preferences.d"
361 352
}
362 353

  
363 354
report_and_cleanup(){
......
409 400
: ${IMAGE_DIR:="@localstatedir@/lib/snf-image"}
410 401
: ${IMAGE_DEBUG:="no"}
411 402
: ${HELPER_DIR:="@HELPER_DIR@"}
412
: ${HELPER_CACHE_DIR:="@HELPER_CACHE_DIR@"}
413 403
: ${HELPER_IMG:="@HELPER_IMG@"}
414 404
: ${HELPER_KERNEL:="@HELPER_KERNEL@"}
415 405
: ${HELPER_INITRD:="@HELPER_INITRD@"}

Also available in: Unified diff