From ea4779d51c504722caf5295c67204f104d4d5e5a Mon Sep 17 00:00:00 2001 From: Jiwoong Im Date: Wed, 23 Nov 2016 22:02:20 +0900 Subject: [PATCH] modify 3.0 upgrade script and tool - remove 2.4 vconf directroy after upgrade - add a missing memory layer Change-Id: If6c7c0126983a48aed07fb25c08ff56eef55a312 Signed-off-by: Jiwoong Im --- migration/vconf_migration.c | 5 ++++- scripts/100.buxton2_upgrade.sh | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/migration/vconf_migration.c b/migration/vconf_migration.c index 8580b69..070fba2 100644 --- a/migration/vconf_migration.c +++ b/migration/vconf_migration.c @@ -191,7 +191,10 @@ int main(int argc, char *argv[]) fprintf(stderr, "fail to migrate db backend keys : %d", errno); if (_load_vconf_dir("/opt/var/kdb/file") < 0) - fprintf(stderr, "fail to migrate db backend keys : %d", errno); + fprintf(stderr, "fail to migrate file backend keys : %d", errno); + + if (_load_vconf_dir("/opt/var/kdb/memory_init/memory") < 0) + fprintf(stderr, "fail to migrate memory backend keys : %d", errno); return EXIT_SUCCESS; } diff --git a/scripts/100.buxton2_upgrade.sh b/scripts/100.buxton2_upgrade.sh index a86e583..312e376 100644 --- a/scripts/100.buxton2_upgrade.sh +++ b/scripts/100.buxton2_upgrade.sh @@ -5,6 +5,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin RW_DB_PATH=/var/lib/buxton2 +VCONF_KEY_PATH=/opt/var/kdb mkdir -p $RW_DB_PATH chown -R buxton:buxton $RW_DB_PATH @@ -12,4 +13,8 @@ chmod 700 $RW_DB_PATH chsmack -a System $RW_DB_PATH chsmack -t $RW_DB_PATH -vconf_migration +if [ -d "$VCONF_KEY_PATH" ] +then + vconf_migration + rm -r $VCONF_KEY_PATH +fi -- 2.7.4