diff -Nru debootstrap-1.0.39/debian/changelog debootstrap-1.0.40/debian/changelog --- debootstrap-1.0.39/debian/changelog 2012-03-13 17:21:15.000000000 +0000 +++ debootstrap-1.0.40/debian/changelog 2012-05-04 10:50:12.000000000 +0000 @@ -1,3 +1,27 @@ +debootstrap (1.0.40-0yavdr0~precise) precise; urgency=medium + + * install base-passwd before base-files + + -- Gerald Dachs Fri, 04 May 2012 12:48:35 +0200 + +debootstrap (1.0.40~precise1) precise-backports; urgency=low + + * Automated backport upload; no source changes. + + -- Scott Kitterman Fri, 27 Apr 2012 22:13:21 +0000 + +debootstrap (1.0.40) unstable; urgency=low + + [ Joey Hess ] + * When installation or configuration of a package fails, output a message + that points the user to the log file. Attempt to grep out the first + package that dpkg failed on and show its name too. Closes: #472704 + + [ Colin Watson ] + * Add (Ubuntu) quantal as a symlink to gutsy. + + -- Colin Watson Thu, 26 Apr 2012 17:44:44 +0100 + debootstrap (1.0.39) unstable; urgency=low * Retry corrupted downloads rather than carrying on almost regardless. diff -Nru debootstrap-1.0.39/functions debootstrap-1.0.40/functions --- debootstrap-1.0.39/functions 2012-03-13 17:06:53.000000000 +0000 +++ debootstrap-1.0.40/functions 2012-04-26 14:39:51.000000000 +0000 @@ -877,6 +877,18 @@ shift; shift; shift if ! $CHROOT_CMD "$@"; then warning "$code" "$msg" "$arg" + # Try to point user at actual failing package. + msg="See %s for details" + if [ -e "$TARGET/debootstrap/debootstrap.log" ]; then + arg="$TARGET/debootstrap/debootstrap.log" + local pkg="$(grep '^dpkg: error processing ' "$TARGET/debootstrap/debootstrap.log" | head -n 1 | cut -d ' ' -f 4)" + if [ -n "$pkg" ]; then + msg="$msg (possibly the package $pkg is at fault)" + fi + else + arg="the log" + fi + warning "$code" "$msg" "$arg" return 1 fi return 0 diff -Nru debootstrap-1.0.39/scripts/gutsy debootstrap-1.0.40/scripts/gutsy --- debootstrap-1.0.39/scripts/gutsy 2011-07-29 09:14:35.000000000 +0000 +++ debootstrap-1.0.40/scripts/gutsy 2012-05-04 07:49:30.000000000 +0000 @@ -106,7 +106,8 @@ p; progress $baseprog $bases INSTCORE "Installing core packages" #2 ln -sf mawk "$TARGET/usr/bin/awk" - x_core_install base-files base-passwd + x_core_install base-passwd + x_core_install base-files p; progress $baseprog $bases INSTCORE "Installing core packages" #3 x_core_install dpkg diff -Nru debootstrap-1.0.39/scripts/hardy debootstrap-1.0.40/scripts/hardy --- debootstrap-1.0.39/scripts/hardy 2011-07-29 09:14:35.000000000 +0000 +++ debootstrap-1.0.40/scripts/hardy 2012-05-04 07:49:30.000000000 +0000 @@ -106,7 +106,8 @@ p; progress $baseprog $bases INSTCORE "Installing core packages" #2 ln -sf mawk "$TARGET/usr/bin/awk" - x_core_install base-files base-passwd + x_core_install base-passwd + x_core_install base-files p; progress $baseprog $bases INSTCORE "Installing core packages" #3 x_core_install dpkg diff -Nru debootstrap-1.0.39/scripts/intrepid debootstrap-1.0.40/scripts/intrepid --- debootstrap-1.0.39/scripts/intrepid 2011-07-29 09:14:35.000000000 +0000 +++ debootstrap-1.0.40/scripts/intrepid 2012-05-04 07:49:30.000000000 +0000 @@ -106,7 +106,8 @@ p; progress $baseprog $bases INSTCORE "Installing core packages" #2 ln -sf mawk "$TARGET/usr/bin/awk" - x_core_install base-files base-passwd + x_core_install base-passwd + x_core_install base-files p; progress $baseprog $bases INSTCORE "Installing core packages" #3 x_core_install dpkg diff -Nru debootstrap-1.0.39/scripts/jaunty debootstrap-1.0.40/scripts/jaunty --- debootstrap-1.0.39/scripts/jaunty 2011-07-29 09:14:35.000000000 +0000 +++ debootstrap-1.0.40/scripts/jaunty 2012-05-04 07:49:30.000000000 +0000 @@ -106,7 +106,8 @@ p; progress $baseprog $bases INSTCORE "Installing core packages" #2 ln -sf mawk "$TARGET/usr/bin/awk" - x_core_install base-files base-passwd + x_core_install base-passwd + x_core_install base-files p; progress $baseprog $bases INSTCORE "Installing core packages" #3 x_core_install dpkg diff -Nru debootstrap-1.0.39/scripts/karmic debootstrap-1.0.40/scripts/karmic --- debootstrap-1.0.39/scripts/karmic 2011-07-29 09:14:35.000000000 +0000 +++ debootstrap-1.0.40/scripts/karmic 2012-05-04 07:49:30.000000000 +0000 @@ -106,7 +106,8 @@ p; progress $baseprog $bases INSTCORE "Installing core packages" #2 ln -sf mawk "$TARGET/usr/bin/awk" - x_core_install base-files base-passwd + x_core_install base-passwd + x_core_install base-files p; progress $baseprog $bases INSTCORE "Installing core packages" #3 x_core_install dpkg diff -Nru debootstrap-1.0.39/scripts/lucid debootstrap-1.0.40/scripts/lucid --- debootstrap-1.0.39/scripts/lucid 2011-07-29 09:14:35.000000000 +0000 +++ debootstrap-1.0.40/scripts/lucid 2012-05-04 07:49:30.000000000 +0000 @@ -106,7 +106,8 @@ p; progress $baseprog $bases INSTCORE "Installing core packages" #2 ln -sf mawk "$TARGET/usr/bin/awk" - x_core_install base-files base-passwd + x_core_install base-passwd + x_core_install base-files p; progress $baseprog $bases INSTCORE "Installing core packages" #3 x_core_install dpkg diff -Nru debootstrap-1.0.39/scripts/maverick debootstrap-1.0.40/scripts/maverick --- debootstrap-1.0.39/scripts/maverick 2011-07-29 09:14:35.000000000 +0000 +++ debootstrap-1.0.40/scripts/maverick 2012-05-04 07:49:30.000000000 +0000 @@ -106,7 +106,8 @@ p; progress $baseprog $bases INSTCORE "Installing core packages" #2 ln -sf mawk "$TARGET/usr/bin/awk" - x_core_install base-files base-passwd + x_core_install base-passwd + x_core_install base-files p; progress $baseprog $bases INSTCORE "Installing core packages" #3 x_core_install dpkg diff -Nru debootstrap-1.0.39/scripts/natty debootstrap-1.0.40/scripts/natty --- debootstrap-1.0.39/scripts/natty 2011-07-29 09:14:35.000000000 +0000 +++ debootstrap-1.0.40/scripts/natty 2012-05-04 07:49:30.000000000 +0000 @@ -106,7 +106,8 @@ p; progress $baseprog $bases INSTCORE "Installing core packages" #2 ln -sf mawk "$TARGET/usr/bin/awk" - x_core_install base-files base-passwd + x_core_install base-passwd + x_core_install base-files p; progress $baseprog $bases INSTCORE "Installing core packages" #3 x_core_install dpkg diff -Nru debootstrap-1.0.39/scripts/oneiric debootstrap-1.0.40/scripts/oneiric --- debootstrap-1.0.39/scripts/oneiric 2011-07-29 09:14:35.000000000 +0000 +++ debootstrap-1.0.40/scripts/oneiric 2012-05-04 07:49:30.000000000 +0000 @@ -106,7 +106,8 @@ p; progress $baseprog $bases INSTCORE "Installing core packages" #2 ln -sf mawk "$TARGET/usr/bin/awk" - x_core_install base-files base-passwd + x_core_install base-passwd + x_core_install base-files p; progress $baseprog $bases INSTCORE "Installing core packages" #3 x_core_install dpkg diff -Nru debootstrap-1.0.39/scripts/precise debootstrap-1.0.40/scripts/precise --- debootstrap-1.0.39/scripts/precise 2011-07-29 09:14:35.000000000 +0000 +++ debootstrap-1.0.40/scripts/precise 2012-05-04 07:49:30.000000000 +0000 @@ -106,7 +106,8 @@ p; progress $baseprog $bases INSTCORE "Installing core packages" #2 ln -sf mawk "$TARGET/usr/bin/awk" - x_core_install base-files base-passwd + x_core_install base-passwd + x_core_install base-files p; progress $baseprog $bases INSTCORE "Installing core packages" #3 x_core_install dpkg diff -Nru debootstrap-1.0.39/scripts/quantal debootstrap-1.0.40/scripts/quantal --- debootstrap-1.0.39/scripts/quantal 1970-01-01 00:00:00.000000000 +0000 +++ debootstrap-1.0.40/scripts/quantal 2012-05-04 07:49:30.000000000 +0000 @@ -0,0 +1,215 @@ +case $ARCH in + amd64|i386) + default_mirror http://archive.ubuntu.com/ubuntu + ;; + sparc) + case $SUITE in + gutsy) + default_mirror http://archive.ubuntu.com/ubuntu + ;; + *) + default_mirror http://ports.ubuntu.com/ubuntu-ports + ;; + esac + ;; + *) + default_mirror http://ports.ubuntu.com/ubuntu-ports + ;; +esac +mirror_style release +download_style apt +finddebs_style from-indices +variants - buildd fakechroot minbase +keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg + +if doing_variant fakechroot; then + test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started" +fi + +case $ARCH in + alpha|ia64) LIBC="libc6.1" ;; + *) LIBC="libc6" ;; +esac + +work_out_debs () { + required="$(get_debs Priority: required)" + + if doing_variant -; then + #required="$required $(get_debs Priority: important)" + # ^^ should be getting debconf here somehow maybe + base="$(get_debs Priority: important)" + elif doing_variant buildd; then + base="$(get_debs Build-Essential: yes)" + elif doing_variant fakechroot || doing_variant minbase; then + base="apt" + fi +} + +first_stage_install () { + extract $required + + mkdir -p "$TARGET/var/lib/dpkg" + : >"$TARGET/var/lib/dpkg/status" + : >"$TARGET/var/lib/dpkg/available" + + setup_etc + if [ ! -e "$TARGET/etc/fstab" ]; then + echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab" + chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" + fi + + x_feign_install () { + local pkg="$1" + local deb="$(debfor $pkg)" + local ver="$(extract_deb_field "$TARGET/$deb" Version)" + + mkdir -p "$TARGET/var/lib/dpkg/info" + + echo \ +"Package: $pkg +Version: $ver +Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" + + touch "$TARGET/var/lib/dpkg/info/${pkg}.list" + } + + x_feign_install dpkg +} + +second_stage_install () { + x_core_install () { + smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") + } + + p () { + baseprog="$(($baseprog + ${1:-1}))" + } + + setup_devices + + if doing_variant fakechroot; then + setup_proc_fakechroot + else + setup_proc + in_target /sbin/ldconfig + fi + + DEBIAN_FRONTEND=noninteractive + DEBCONF_NONINTERACTIVE_SEEN=true + export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN + + baseprog=0 + bases=7 + + p; progress $baseprog $bases INSTCORE "Installing core packages" #1 + info INSTCORE "Installing core packages..." + + p; progress $baseprog $bases INSTCORE "Installing core packages" #2 + ln -sf mawk "$TARGET/usr/bin/awk" + x_core_install base-passwd + x_core_install base-files + p; progress $baseprog $bases INSTCORE "Installing core packages" #3 + x_core_install dpkg + + if [ ! -e "$TARGET/etc/localtime" ]; then + ln -sf /usr/share/zoneinfo/Etc/UTC "$TARGET/etc/localtime" + fi + + if doing_variant fakechroot; then + install_fakechroot_tools + fi + + p; progress $baseprog $bases INSTCORE "Installing core packages" #4 + x_core_install $LIBC + + p; progress $baseprog $bases INSTCORE "Installing core packages" #5 + x_core_install perl-base + + p; progress $baseprog $bases INSTCORE "Installing core packages" #6 + rm "$TARGET/usr/bin/awk" + x_core_install mawk + + p; progress $baseprog $bases INSTCORE "Installing core packages" #7 + if doing_variant -; then + x_core_install debconf + fi + + baseprog=0 + bases=$(set -- $required; echo $#) + + info UNPACKREQ "Unpacking required packages..." + + smallyes '' | + (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages. This will be attempted up to five times." "" \ + dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 | + dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1 + + info CONFREQ "Configuring required packages..." + + if doing_variant fakechroot; then + # fix initscripts postinst (no mounting possible, and wrong if condition) + sed -i '/dpkg.*--compare-versions/ s/\/lt-nl/' "$TARGET/var/lib/dpkg/info/initscripts.postinst" + fi + + mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL" + echo \ +"#!/bin/sh +echo +echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon" + chmod 755 "$TARGET/sbin/start-stop-daemon" + + if [ -x "$TARGET/sbin/initctl" ]; then + mv "$TARGET/sbin/initctl" "$TARGET/sbin/initctl.REAL" + echo \ +"#!/bin/sh +echo +echo \"Warning: Fake initctl called, doing nothing\"" > "$TARGET/sbin/initctl" + chmod 755 "$TARGET/sbin/initctl" + fi + + setup_dselect_method apt + + smallyes '' | + (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \ + dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 | + dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1 + + baseprog=0 + bases="$(set -- $base; echo $#)" + + info UNPACKBASE "Unpacking the base system..." + + setup_available $required $base + done_predeps= + while predep=$(get_next_predep); do + # We have to resolve dependencies of pre-dependencies manually because + # dpkg --predep-package doesn't handle this. + predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps") + # XXX: progress is tricky due to how dpkg_progress works + # -- cjwatson 2009-07-29 + p; smallyes '' | + in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep) + base=$(without "$base" "$predep") + done_predeps="$done_predeps $predep" + done + + smallyes '' | + (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \ + dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 | + dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1 + + info CONFBASE "Configuring the base system..." + + smallyes '' | + (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \ + dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 | + dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1 + + if [ -x "$TARGET/sbin/initctl.REAL" ]; then + mv "$TARGET/sbin/initctl.REAL" "$TARGET/sbin/initctl" + fi + mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" + + progress $bases $bases CONFBASE "Configuring base system" + info BASESUCCESS "Base system installed successfully." +}