From: Otavio Salvador <[EMAIL PROTECTED]> When using live-installer we ought not run base-installer and pkgsel modules and then we provide isinstallable files that when live-installer/enable is true it disable these modules. ---
.../debian/base-installer.isinstallable | 4 ++++ packages/base-installer/debian/changelog | 1 + packages/base-installer/debian/rules | 1 + packages/pkgsel/debian/changelog | 6 +++++- packages/pkgsel/debian/pkgsel.isinstallable | 2 ++ 5 files changed, 13 insertions(+), 1 deletions(-) diff --git a/packages/base-installer/debian/base-installer.isinstallable b/packages/base-installer/debian/base-installer.isinstallable new file mode 100644 index 0000000..d813011 --- /dev/null +++ b/packages/base-installer/debian/base-installer.isinstallable @@ -0,0 +1,4 @@ +#!/bin/sh +. /usr/share/debconf/confmodule +db_get live-installer/enable && [ "$RET" = true ] && exit 1 +exit 0 diff --git a/packages/base-installer/debian/changelog b/packages/base-installer/debian/changelog index 021d403..f4233a4 100644 --- a/packages/base-installer/debian/changelog +++ b/packages/base-installer/debian/changelog @@ -2,6 +2,7 @@ base-installer (1.81) UNRELEASED; urgency=low * Provides installed-base. This is need to be able to use alternative ways of installing Debian. + * Avoid running if live-installer/enable is true. -- Otavio Salvador <[EMAIL PROTECTED]> Sun, 17 Jun 2007 10:02:39 -0300 diff --git a/packages/base-installer/debian/rules b/packages/base-installer/debian/rules index 0b1e7c7..4e2032c 100755 --- a/packages/base-installer/debian/rules +++ b/packages/base-installer/debian/rules @@ -50,6 +50,7 @@ binary-arch: install dh_testroot dh_installdebconf -n (echo ; cat debian/templates) >> debian/base-installer/DEBIAN/templates + cp debian/base-installer.isinstallable debian/base-installer/DEBIAN/isinstallable dh_strip dh_compress dh_fixperms diff --git a/packages/pkgsel/debian/changelog b/packages/pkgsel/debian/changelog index 53e014c..fc0b358 100644 --- a/packages/pkgsel/debian/changelog +++ b/packages/pkgsel/debian/changelog @@ -1,12 +1,16 @@ pkgsel (0.14) UNRELEASED; urgency=low + [ Joey Hess ] * Pass APT::Install-Recommends=false to apt when installing popularity-contest to avoid dragging in any recommends there with the new apt. * No need to do this for aptitude runs, the existing --without-recommends is sufficient. - -- Joey Hess <[EMAIL PROTECTED]> Mon, 18 Jun 2007 09:09:25 +0100 + [ Otavio Salvador ] + * Avoid tunning in case live-installer is being use. + + -- Otavio Salvador <[EMAIL PROTECTED]> Mon, 18 Jun 2007 07:18:04 -0300 pkgsel (0.13) unstable; urgency=low diff --git a/packages/pkgsel/debian/pkgsel.isinstallable b/packages/pkgsel/debian/pkgsel.isinstallable index fb0c748..93c4b13 100755 --- a/packages/pkgsel/debian/pkgsel.isinstallable +++ b/packages/pkgsel/debian/pkgsel.isinstallable @@ -7,4 +7,6 @@ if db_get mirror/codename && [ "$RET" ]; then exit 1 fi fi +db_get live-installer/enable && [ "$RET" = true ] && exit 1 + exit 0 _______________________________________________ Debian-live-devel mailing list Debian-live-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/debian-live-devel