Upgrade: sdb related issues

To launch sdb properly in upgrade mode, several initialize
scripts should be run before sdbd.service.

Change-Id: I1573f9f172a06935b52c1b16ef4619d6ca0c2bc6
Signed-off-by: Sunmin Lee <sunm.lee@samsung.com>

diff --git a/units/init-update.service b/units/init-update.service
index e438cb3..d211f0e 100644 (file)
--- a/units/init-update.service
+++ b/units/init-update.service
@@ -2,7 +2,8 @@
 Description=System update initialize service
 Requires=sysinit.target
 After=sysinit.target
+Before=sdbd.service
 
 [Service]
-Type=simple
+Type=oneshot
 ExecStart=/system-update/update-init.sh

diff --git a/upgrade/update-init.sh b/upgrade/update-init.sh
index d27697e..5cbc09a 100755 (executable)
--- a/upgrade/update-init.sh
+++ b/upgrade/update-init.sh
@@ -24,8 +24,15 @@ cp -af /usr/share/upgrade/data/home/owner /opt/usr/home
 rm -rf /var/lib/rpm/*
 cp -af /usr/share/upgrade/data/rpm/* /var/lib/rpm
 
-# Disable cynara-check
-buxton2ctl security-disable
+# For sdb debugging
+/usr/share/upgrade/scripts/010.tizen-platform-config.patch.sh
+/usr/share/upgrade/scripts/011.security_upgrade.sh
+/usr/share/upgrade/scripts/100.buxton2_upgrade.sh
+
+# Prevent executing again
+mv /usr/share/upgrade/scripts/010.tizen-platform-config.patch.sh /usr/share/upgrade
+mv /usr/share/upgrade/scripts/011.security_upgrade.sh /usr/share/upgrade
+mv /usr/share/upgrade/scripts/100.buxton2_upgrade.sh /usr/share/upgrade
 
 ####### filesystem update #######
 rm -rf /var/lock