[SCM] live-config branch, debian-next, updated. debian/3.0_a31-1-7-gf7d3895

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit f7d389500ae20b27b8364174ab2d3bdb05ffcc09
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Feb 6 22:44:58 2012 +0100

    Switching to use /debconf.live as a temporary debconf location for user-setup script, rather than /tmp/debconf.live, as /tmp is not already there in wheezy and newer when live-config is executed.
    
    Eventhough this is rather ugly to create such a temporary file
    in the root directory, it is even worse if we run a mkdir /tmp
    just to be able to store it there.

diff --git a/scripts/config/002-user-setup b/scripts/config/002-user-setup
index c6bd656..28d9dfa 100755
--- a/scripts/config/002-user-setup
+++ b/scripts/config/002-user-setup
@@ -65,7 +65,7 @@ Configure_user_setup ()
 	# a blank password is 'U6aMy0wojraho'.
 	_PASSWORD="8Ab05sVQ4LLps"
 
-cat > /tmp/debconf.live << EOF
+cat > /debconf.live << EOF
 user-setup passwd/make-user boolean true
 user-setup passwd/root-password-crypted string *
 user-setup passwd/user-password-crypted string ${_PASSWORD}
@@ -75,8 +75,8 @@ user-setup passwd/username string ${LIVE_USERNAME}
 user-setup passwd/user-uid string 1000
 EOF
 
-	debconf-set-selections < /tmp/debconf.live
-	rm -f /tmp/debconf.live
+	debconf-set-selections < /debconf.live
+	rm -f /debconf.live
 
 	# FIXME
 	set +e

-- 
live-config