[Fai-commit] r5508 - in people: . mika mika/3.2.20-bugfix-dirinstall/debian mika/3.2.20-bugfix-dirinstall/lib

[Michael Prokop]

Author: mika
Date: 2009-09-10 13:34:31 +0000 (Thu, 10 Sep 2009)
New Revision: 5508

Added:
   people/mika/
   people/mika/3.2.20-bugfix-dirinstall/
   people/mika/author
Modified:
   people/mika/3.2.20-bugfix-dirinstall/debian/changelog
   people/mika/3.2.20-bugfix-dirinstall/lib/subroutines-linux
Log:
Bugfix branch for 3.2.20 (fix dirinstall)

Modified: people/mika/3.2.20-bugfix-dirinstall/debian/changelog
===================================================================
--- tags/3.2.20/debian/changelog	2009-09-09 12:51:03 UTC (rev 5507)
+++ people/mika/3.2.20-bugfix-dirinstall/debian/changelog	2009-09-10 13:34:31 UTC (rev 5508)
@@ -1,3 +1,10 @@
+fai (3.2.20.1) unstable; urgency=low
+
+  * Bugfix release: backport bugfix from svn r5407:
+    subroutines-linux: remove yes pipe when calling debootstrap
+
+ -- Michael Prokop <mika at grml.org>  Thu, 10 Sep 2009 15:32:23 +0200
+
 fai (3.2.20) unstable; urgency=low
 
   [ Thomas Lange ]

Modified: people/mika/3.2.20-bugfix-dirinstall/lib/subroutines-linux
===================================================================
--- tags/3.2.20/lib/subroutines-linux	2009-09-09 12:51:03 UTC (rev 5507)
+++ people/mika/3.2.20-bugfix-dirinstall/lib/subroutines-linux	2009-09-10 13:34:31 UTC (rev 5508)
@@ -143,7 +143,7 @@
     local dversion=$(dpkg -l debootstrap | grep debootstrap | cut -f7 -d' ')
     echo "Creating base system using debootstrap version $dversion"
     echo "Calling debootstrap $1 $FAI_DEBOOTSTRAP_OPTS $FAI_ROOT $2"
-    yes '' | LC_ALL=C debootstrap $FAI_DEBOOTSTRAP_OPTS $1 $FAI_ROOT $2
+    LC_ALL=C debootstrap $FAI_DEBOOTSTRAP_OPTS $1 $FAI_ROOT $2
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ### BEGIN SUBROUTINE INFO

Added: people/mika/author
===================================================================
--- people/mika/author	                        (rev 0)
+++ people/mika/author	2009-09-10 13:34:31 UTC (rev 5508)
@@ -0,0 +1 @@
+Michael Prokop <mika at grml.org>