diff options
| -rwxr-xr-x | pbuilder-createbuildenv | 8 | ||||
| -rw-r--r-- | pbuilder-runhooks | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index 8da12dc..e42a185 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -19,13 +19,19 @@ if [ ! -d "$BUILDPLACE" ]; then exit 1 fi echo " -> running debootstrap" +DEBOOTSTRAPSCRIPT="" +if [ -n "$HOOKDIR" ]; then + if [ -f "$HOOKDIR/$DISTRIBUTION" ]; then + DEBOOTSTRAPSCRIPT="$HOOKDIR/$DISTRIBUTION" + echo " -> Applying user distribution dist build script $DEBOOTSTRAPSCRIPT" + fi +fi if ! ( cd "$BUILDPLACE" && debootstrap "$DISTRIBUTION" . "$MIRRORSITE" "$DEBOOTSTRAPSCRIPT" ) ; then echo "pbuilder: debootstrap failed" >&2 exit 1 fi echo " -> debootstrap finished" -DEBOOTSTRAPSCRIPT="" if [ -n "$HOOKDIR" ]; then loadhooks fi diff --git a/pbuilder-runhooks b/pbuilder-runhooks index 6786381..09cefc6 100644 --- a/pbuilder-runhooks +++ b/pbuilder-runhooks @@ -18,6 +18,9 @@ # # HISTORY: # $Log$ +# Revision 1.9 2001/10/12 16:31:18 dancer +# fixed my logical disorder. +# # Revision 1.8 2001/10/12 15:54:32 dancer # diff # @@ -67,10 +70,6 @@ function loadhooks () { mkdir -p "$BUILDPLACE/tmp/hooks" cp -a "$HOOKDIR/*" "$BUILDPLACE/$hooks" fi - if [ -f "$BUILDPLACE/$hooks/$DISTRIBUTION" ]; then - DEBOOTSTRAPSCRIPT=/"$hooks/$DISTRIBUTION" - echo " -> Applying user distribution dist build script $DEBOOTSTRAPSCRIPT" - fi } #-------------------------------------------------------------------------- |