aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Documentation/pbuilder-doc.xml13
-rw-r--r--Makefile1
-rw-r--r--debian/changelog4
-rwxr-xr-xexamples/C11screen8
5 files changed, 32 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ac2e82..2f1d002 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2007-05-27 Junichi Uekawa <dancer@debian.org>
+ * Documentation/pbuilder-doc.xml: add documentation about
+ C11screen.
+
+ * Makefile: install the new example.
+
+ * examples/C11screen: add new hook, which might be more useful,
+ call GNU screen instead of bash.
+
* pbuilder-updatebuildenv:
* pbuilder-createbuildenv: exit 0 at end.
diff --git a/Documentation/pbuilder-doc.xml b/Documentation/pbuilder-doc.xml
index 7a7d330..eae9497 100644
--- a/Documentation/pbuilder-doc.xml
+++ b/Documentation/pbuilder-doc.xml
@@ -4,7 +4,7 @@
and the latest version is found in git repository. -->
<book xml:lang="en">
<bookinfo>
- <date>2007-4-10</date>
+ <date>2007-5-27</date>
<title>pbuilder User's Manual</title>
<abbrev>pbuilder-doc</abbrev>
<subtitle>Usage and operations</subtitle>
@@ -787,6 +787,17 @@ read
directories under the user's home directory for bind-mounts.
</para>
</sect1>
+ <sect1 id="shellafterfail">
+ <title>Logging in to pbuilder to investigate build failure</title>
+ <para>
+ It is possible to invoke a shell session after a build
+ failure. Example hook script are provided as
+ <filename>C10shell</filename> and
+ <filename>C11screen</filename> scripts. C10shell script will
+ start bash inside chroot, and C11screen script will start GNU
+ screen inside the chroot.
+ </para>
+ </sect1>
<sect1 id="modifyupdate">
<title>Logging in to pbuilder to modify the environment</title>
<para>
diff --git a/Makefile b/Makefile
index d0d8cf9..6dac7fc 100644
--- a/Makefile
+++ b/Makefile
@@ -87,6 +87,7 @@ install:
$(INSTALL_EXECUTABLE) examples/B91dpkg-i $(DESTDIR)/usr/share/doc/pbuilder/examples
$(INSTALL_EXECUTABLE) examples/B92test-pkg $(DESTDIR)/usr/share/doc/pbuilder/examples
$(INSTALL_EXECUTABLE) examples/C10shell $(DESTDIR)/usr/share/doc/pbuilder/examples
+ $(INSTALL_EXECUTABLE) examples/C11screen $(DESTDIR)/usr/share/doc/pbuilder/examples
$(INSTALL_EXECUTABLE) examples/D10tmp $(DESTDIR)/usr/share/doc/pbuilder/examples
$(INSTALL_EXECUTABLE) examples/D90chrootmemo $(DESTDIR)/usr/share/doc/pbuilder/examples
$(INSTALL_EXECUTABLE) examples/F90chrootmemo $(DESTDIR)/usr/share/doc/pbuilder/examples
diff --git a/debian/changelog b/debian/changelog
index 3e557a3..73a0264 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,13 +14,15 @@ pbuilder (0.167) UNRELEASED; urgency=low
(Closes: #424717).
- pdebuild will create .build file in similar manner to debuild command
- output is tee'd to terminal and also the logfile.
+ * add C11screen example script, which starts up GNU screen after build
+ failure.
[ Loic Minier ]
* Tune aptitude opts in pbuilder-satisfydepends-aptitude to handle complex
dependencies in experimental, to support unsigned APT repositories, and to
not install Recommends.
- -- Junichi Uekawa <dancer@debian.org> Sun, 27 May 2007 13:50:46 +0900
+ -- Junichi Uekawa <dancer@debian.org> Sun, 27 May 2007 14:48:37 +0900
pbuilder (0.166) unstable; urgency=low
diff --git a/examples/C11screen b/examples/C11screen
new file mode 100755
index 0000000..5f11769
--- /dev/null
+++ b/examples/C11screen
@@ -0,0 +1,8 @@
+#!/bin/bash
+# example file to be used with --hookdir
+#
+# invoke GNU screen if build fails.
+
+export debian_chroot="pbuilder"
+apt-get install -y --force-yes screen
+screen </dev/tty > /dev/tty