=== modified file 'debian/changelog' --- debian/changelog 2009-02-27 05:38:19 +0000 +++ debian/changelog 2009-03-11 10:02:05 +0000 @@ -1,3 +1,9 @@ +user-setup (1.23ubuntu15) jaunty; urgency=low + + * Consider a password of '!' in shadow for root to be unset (LP: #340841) + + -- Bryan McLellan Wed, 11 Mar 2009 02:57:46 -0700 + user-setup (1.23ubuntu14) jaunty; urgency=low * user-setup/password-weak can't be preseeded since that would interfere === modified file 'functions.sh' --- functions.sh 2009-02-27 05:32:48 +0000 +++ functions.sh 2009-03-11 09:57:16 +0000 @@ -36,6 +36,7 @@ if [ -e $ROOT/etc/shadow ] && \ [ -n "`grep ^root: $ROOT/etc/shadow | cut -d : -f 2`" ] && \ + [ "x`grep ^root: $ROOT/etc/shadow | cut -d : -f 2`" != 'x!' ] && \ [ "x`grep ^root: $ROOT/etc/shadow | cut -d : -f 2`" != 'x*' ]; then return 0 fi