Upgrade: Several modifications for exclusion of basic.taget

- cynara.socket for cynara update
- Set default dependency no to services
- SDB debugging disabled

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

diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index 06a1e973f25a46dd00c25314bfdde135038ce09a..241f278e4349a37dcd658fec1ae01857b9e79d2d 100644 (file)
--- a/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@ -185,6 +185,7 @@ install -m 644 units/init-update.service %{buildroot}%{_unitdir}
 install -m 644 units/offline-update.service %{buildroot}%{_unitdir}
 ln -s ../init-update.service %{buildroot}%{_unitdir}/system-update.target.wants/init-update.service
 ln -s ../getty.target %{buildroot}%{_unitdir}/system-update.target.wants
+ln -s ../cynara.socket %{buildroot}%{_unitdir}/system-update.target.wants
 
 # ivi
 install -m 755 scripts/usb_net_init.sh %{buildroot}%{_bindir}
@@ -307,6 +308,7 @@ mv %{_sysconfdir}/fstab_lazymnt %{_sysconfdir}/fstab
 #%{_unitdir}/system-update.target.wants/offline-update.service
 %{_unitdir}/system-update.target.wants/init-update.service
 %{_unitdir}/system-update.target.wants/getty.target
+%{_unitdir}/system-update.target.wants/cynara.socket
 
 %files -n systemd-user-helper
 %manifest systemd-user-helper.manifest

diff --git a/scripts/make_upgrade_image.sh b/scripts/make_upgrade_image.sh
index 15968ce6b7520b64f271ecf216c0982dca013e1d..b6f143349ff4d9090be4124e85ef8de6094c7da8 100644 (file)
--- a/scripts/make_upgrade_image.sh
+++ b/scripts/make_upgrade_image.sh
@@ -6,7 +6,7 @@
 
 # For sdb debugging
 
-sdb_debugging=1
+sdb_debugging=0
 sdb_rule='SUBSYSTEM=="switch", ATTR{name}=="usb_cable", ATTR{state}=="1", RUN+="/usr/bin/direct_set_debug.sh --sdb-set"\nSUBSYSTEM=="switch", ATTR{name}=="usb_cable", ATTR{state}=="0", RUN+="/usr/bin/direct_set_debug.sh --sdb-unset"'
 
 # Back up /home/owner & rpm db

diff --git a/units/init-update.service b/units/init-update.service
index d211f0ef4453286dd58b3c0bde76b2bcee7377c9..672a76a12027e42514751aec34705734703418ba 100644 (file)
--- a/units/init-update.service
+++ b/units/init-update.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=System update initialize service
+DefaultDependencies=no
 Requires=sysinit.target
 After=sysinit.target
 Before=sdbd.service

diff --git a/units/offline-update.service b/units/offline-update.service
index ed0061620ac3dab16ab3b981fea263249a2a4b1c..adc8f12bd1c9349803ddffb611b632545c33fb8f 100644 (file)
--- a/units/offline-update.service
+++ b/units/offline-update.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=System update script service
+DefaultDependencies=no
 Requires=sysinit.target
 After=sysinit.target init-update.service
 

diff --git a/upgrade/update-init.sh b/upgrade/update-init.sh
index 4974e9e47906f29f4bc236199df68821ebea81d0..371abfe83c83e84171756262f998142609f4f963 100755 (executable)
--- a/upgrade/update-init.sh
+++ b/upgrade/update-init.sh
@@ -24,18 +24,3 @@ cp -af /usr/share/upgrade/data/home/owner /opt/usr/home
 # Copy 3.0 rpm db
 rm -rf /var/lib/rpm/*
 cp -af /usr/share/upgrade/data/rpm/* /var/lib/rpm
-
-
-# For sdb debugging
-/usr/share/upgrade/scripts/200.filesystem-pre.patch.sh
-/usr/share/upgrade/scripts/201.tizen-platform-config_upgrade.sh
-/usr/share/upgrade/scripts/210.dlog_upgrade.sh
-/usr/share/upgrade/scripts/201.security_upgrade.sh
-/usr/share/upgrade/scripts/500.buxton2_upgrade.sh
-
-# Prevent executing again
-mv /usr/share/upgrade/scripts/200.filesystem-pre.patch.sh          /usr/share/upgrade
-mv /usr/share/upgrade/scripts/201.tizen-platform-config_upgrade.sh /usr/share/upgrade
-mv /usr/share/upgrade/scripts/210.dlog_upgrade.sh                  /usr/share/upgrade
-mv /usr/share/upgrade/scripts/201.security_upgrade.sh              /usr/share/upgrade
-mv /usr/share/upgrade/scripts/500.buxton2_upgrade.sh               /usr/share/upgrade