[Pkg-shadow-commits] r628 - trunk/debian

[Christian Perrier]

Author: bubulle
Date: 2005-10-31 14:48:11 +0000 (Mon, 31 Oct 2005)
New Revision: 628

Modified:
   trunk/debian/changelog
   trunk/debian/initial-passwd-udeb.postinst
Log:
Sync the initial-passwd-udeb stuff with Ubuntu to get rid of the mktemp error


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-10-31 11:34:00 UTC (rev 627)
+++ trunk/debian/changelog	2005-10-31 14:48:11 UTC (rev 628)
@@ -1,3 +1,12 @@
+shadow (1:4.0.13-4) UNRELEASED; urgency=low
+
+  * The "Comté" release (let's make Nicolas happy)
+  * Debian packaging fixes:
+    - initial-passwd-udeb:
+      Grab last version of Ubuntu code to get rid of the mktemp error
+
+ -- Christian Perrier <bubulle at debian.org>  Mon, 31 Oct 2005 15:46:44 +0100
+
 shadow (1:4.0.13-3) unstable; urgency=high
 
   * The "Trou du Cru" release (actually, the one deserving this name is me)

Modified: trunk/debian/initial-passwd-udeb.postinst
===================================================================
--- trunk/debian/initial-passwd-udeb.postinst	2005-10-31 11:34:00 UTC (rev 627)
+++ trunk/debian/initial-passwd-udeb.postinst	2005-10-31 14:48:11 UTC (rev 628)
@@ -21,37 +21,8 @@
 		chroot /target debconf -o base-config "$@"
 }
 
-tmpfile="$(mktemp /target/tmp/initial-passwd-udeb.XXXXXX)"
-trap "rm -f '$tmpfile'" EXIT HUP INT QUIT TERM
-echo '. /usr/share/debconf/confmodule' >>"$tmpfile"
+debconf-copydb -p ^passwd/ configdb target_configdb
 
-need_copy=
-
-# Copy information from cdebconf to debconf. This is a horrible hack around
-# the lack of a debconf-copydb that works with cdebconf's rfc822db.
-for q in passwd/root-password passwd/root-password-again passwd/make-user \
-		passwd/username passwd/username-bad passwd/user-fullname \
-		passwd/user-password passwd/user-password-again \
-		passwd/password-mismatch passwd/password-empty passwd/shadow \
-		passwd/md5 passwd/root-password-empty \
-		passwd/root-password-crypted passwd/user-password-crypted; do
-	db_get "$q" || continue
-	value="$(printf %s "$RET" | sed "s/'/'\\\\''/g")"
-	db_fget "$q" seen
-	seen="$(printf %s "$RET" | sed "s/'/'\\\\''/g")"
-	cat >>"$tmpfile" <<EOF
-db_register '$q' '$q'
-db_set '$q' '$value'
-db_fset '$q' seen '$seen'
-EOF
-	need_copy=1
-done
-
-if [ "$need_copy" ]; then
-	chmod +x "$tmpfile"
-	target_debconf "${tmpfile#/target}"
-fi
-
 # Ideally, dpkg-reconfigure wouldn't create a new frontend every time. In
 # the meantime, we reimplement a couple of bits of it. Note that
 # DEBCONF_RECONFIGURE=1 is set in target_debconf above.