Quoting Jiri Slaby (jsl...@suse.cz): > Fail if something goes wrong. We used to continue and show one failure > after another. > ---
Acked-by: Serge E. Hallyn <serge.hal...@ubuntu.com> > templates/lxc-opensuse.in | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in > index 820368e..1829ddf 100644 > --- a/templates/lxc-opensuse.in > +++ b/templates/lxc-opensuse.in > @@ -113,10 +113,10 @@ download_opensuse() > # download a mini opensuse into a cache > echo "Downloading opensuse minimal ..." > mkdir -p "$cache/partial-$arch-packages" > - zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar > http://download.opensuse.org/distribution/$DISTRO/repo/oss/ repo-oss > - zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar > http://download.opensuse.org/update/$DISTRO/ update > - zypper --quiet --root $cache/partial-$arch-packages --non-interactive > --gpg-auto-import-keys update > - zypper --root $cache/partial-$arch-packages --non-interactive in > --auto-agree-with-licenses --download-only zypper lxc patterns-openSUSE-base > bash iputils sed tar > + zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar > http://download.opensuse.org/distribution/$DISTRO/repo/oss/ repo-oss || > return 1 > + zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar > http://download.opensuse.org/update/$DISTRO/ update || return 1 > + zypper --quiet --root $cache/partial-$arch-packages --non-interactive > --gpg-auto-import-keys update || return 1 > + zypper --root $cache/partial-$arch-packages --non-interactive in > --auto-agree-with-licenses --download-only zypper lxc patterns-openSUSE-base > bash iputils sed tar || return 1 > cat > $cache/partial-$arch-packages/opensuse.conf << EOF > Preinstall: aaa_base bash coreutils diffutils > Preinstall: filesystem fillup glibc grep insserv > @@ -152,9 +152,9 @@ EOF > done > fi > > - CLEAN_BUILD=1 BUILD_ARCH="$arch" BUILD_ROOT="$cache/partial-$arch" > BUILD_DIST="$cache/partial-$arch-packages/opensuse.conf" > PATH="$PATH:/usr/lib/build" /usr/lib/build/init_buildsystem --clean > --configdir /usr/lib/build/configs --cachedir $cache/partial-$arch-cache > --repository > $cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/$arch > --repository > $cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/noarch > --repository > $cache/partial-$arch-packages/var/cache/zypp/packages/update/$arch > --repository > $cache/partial-$arch-packages/var/cache/zypp/packages/update/noarch > - chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar > http://download.opensuse.org/distribution/$DISTRO/repo/oss repo-oss > - chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar > http://download.opensuse.org/update/$DISTRO/ update > + CLEAN_BUILD=1 BUILD_ARCH="$arch" BUILD_ROOT="$cache/partial-$arch" > BUILD_DIST="$cache/partial-$arch-packages/opensuse.conf" > PATH="$PATH:/usr/lib/build" /usr/lib/build/init_buildsystem --clean > --configdir /usr/lib/build/configs --cachedir $cache/partial-$arch-cache > --repository > $cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/$arch > --repository > $cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/noarch > --repository > $cache/partial-$arch-packages/var/cache/zypp/packages/update/$arch > --repository > $cache/partial-$arch-packages/var/cache/zypp/packages/update/noarch || return > 1 > + chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar > http://download.opensuse.org/distribution/$DISTRO/repo/oss repo-oss || return > 1 > + chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar > http://download.opensuse.org/update/$DISTRO/ update || return 1 > # really clean the image > rm -fr > $cache/partial-$arch/{.build,.guessed_dist,.srcfiles*,installed-pkg} > rm -fr $cache/partial-$arch/dev > -- > 1.8.1.2 > > ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb _______________________________________________ Lxc-devel mailing list Lxc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-devel
