aboutsummaryrefslogtreecommitdiff
path: root/buildtools/debian-skeleton
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2013-04-24 00:42:26 +0000
committerRob Austein <sra@hactrn.net>2013-04-24 00:42:26 +0000
commit818d7eb935f0cfac21561c7f24e50eea44bec47a (patch)
treeb543f1d965a822c5df255ae9221d188a47fda043 /buildtools/debian-skeleton
parent1a25fee2670a50d1c8d1946c591f202b01a6a5e5 (diff)
Rewrite rpki-sql-setup to minimize the number of times we have to
prompt for the MySQL root password during installs and upgrades. svn path=/trunk/; revision=5306
Diffstat (limited to 'buildtools/debian-skeleton')
-rw-r--r--buildtools/debian-skeleton/rpki-ca.postinst2
-rw-r--r--buildtools/debian-skeleton/rpki-ca.prerm2
2 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/debian-skeleton/rpki-ca.postinst b/buildtools/debian-skeleton/rpki-ca.postinst
index cd3bae7e..2d9e6dff 100644
--- a/buildtools/debian-skeleton/rpki-ca.postinst
+++ b/buildtools/debian-skeleton/rpki-ca.postinst
@@ -96,7 +96,7 @@ setup_rpki_conf() {
}
setup_mysql() {
- rpki-sql-setup --mysql_defaults /etc/mysql/debian.cnf
+ rpki-sql-setup --mysql-defaults /etc/mysql/debian.cnf
}
setup_bpki() {
diff --git a/buildtools/debian-skeleton/rpki-ca.prerm b/buildtools/debian-skeleton/rpki-ca.prerm
index 152aa3e8..bb28512f 100644
--- a/buildtools/debian-skeleton/rpki-ca.prerm
+++ b/buildtools/debian-skeleton/rpki-ca.prerm
@@ -36,7 +36,7 @@ case "$1" in
# postpone dropping the databases until the postrm script,
# since that's where we find out whether this is a purge.
- rpki-sql-setup --mysql_defaults /etc/mysql/debian.cnf --script_purge >/etc/rpki/drop_databases.sql
+ rpki-sql-setup --mysql-defaults /etc/mysql/debian.cnf --script-drop >/etc/rpki/drop_databases.sql
# Clean up our cron jobs.