summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunmin Lee <sunm.lee@samsung.com>2016-11-24 16:36:55 +0900
committerSunmin Lee <sunm.lee@samsung.com>2016-11-24 17:48:58 +0900
commitd9ca3be37a0afe54d40912fc1fc2d68ad892ded1 (patch)
treed0f69c341f4cd22e63adbb4776bf11fd063219f5
parent1fc6bbcd906d9d2713c4c36c2ec076c76f800e4a (diff)
downloadsystem-plugin-d9ca3be37a0afe54d40912fc1fc2d68ad892ded1.tar.gz
system-plugin-d9ca3be37a0afe54d40912fc1fc2d68ad892ded1.tar.bz2
system-plugin-d9ca3be37a0afe54d40912fc1fc2d68ad892ded1.zip
Upgrade: sdb related issuessubmit/tizen_3.0/20161124.103638
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>
-rw-r--r--units/init-update.service3
-rwxr-xr-xupgrade/update-init.sh11
2 files changed, 11 insertions, 3 deletions
diff --git a/units/init-update.service b/units/init-update.service
index e438cb3..d211f0e 100644
--- 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
--- 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