[Fusionforge-commits] r11091 - trunk/src/debian/dsf-in
Roland Mas
lolando at libremir.placard.fr.eu.org
Wed Oct 20 22:04:52 CEST 2010
Author: lolando
Date: 2010-10-20 22:04:52 +0200 (Wed, 20 Oct 2010)
New Revision: 11091
Modified:
trunk/src/debian/dsf-in/db-postgresql.config.dsfh-in
trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in
Log:
Use appropriate debconf variable names
Modified: trunk/src/debian/dsf-in/db-postgresql.config.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/db-postgresql.config.dsfh-in 2010-10-20 20:04:11 UTC (rev 11090)
+++ trunk/src/debian/dsf-in/db-postgresql.config.dsfh-in 2010-10-20 20:04:52 UTC (rev 11091)
@@ -14,14 +14,14 @@
#DSFHELPER:dbhost-variables#
#DSFHELPER:dbpasswd-variables#
-db_fget @OLDPACKAGE@/shared/admin_password seen || true
+db_fget @PACKAGE@/shared/admin_password seen || true
if [ "$RET" = "false" ]; then
- if [ "$(get_pw @OLDPACKAGE@/shared/admin_password high)" = "not-asked" ] ; then
- db_set @OLDPACKAGE@/shared/admin_password $(gen_random_pw)
- db_get @OLDPACKAGE@/shared/admin_password || true
+ if [ "$(get_pw @PACKAGE@/shared/admin_password high)" = "not-asked" ] ; then
+ db_set @PACKAGE@/shared/admin_password $(gen_random_pw)
+ db_get @PACKAGE@/shared/admin_password || true
echo "Since you asked not to see all the debconf questions, I generated a random"
echo "password for the admin user. It is '${RET}'." ;
- db_fset @OLDPACKAGE@/shared/admin_password seen true
+ db_fset @PACKAGE@/shared/admin_password seen true
fi
fi
Modified: trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in 2010-10-20 20:04:11 UTC (rev 11090)
+++ trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in 2010-10-20 20:04:52 UTC (rev 11091)
@@ -81,7 +81,7 @@
v=0
/usr/share/@OLDPACKAGE@/bin/install-db.sh configure || v=$?
if test x"$v" = x"100"; then
- db_get @OLDPACKAGE@/shared/admin_password || true
+ db_get @PACKAGE@/shared/admin_password || true
/usr/share/gforge/bin/forge_set_password admin "$RET"
elif test x"$v" != x"0"; then
exit $v
More information about the Fusionforge-commits
mailing list