diff options
| -rw-r--r-- | packaging/system-plugin.spec | 2 | ||||
| -rw-r--r-- | scripts/make_upgrade_image.sh | 2 | ||||
| -rw-r--r-- | units/init-update.service | 1 | ||||
| -rw-r--r-- | units/offline-update.service | 1 | ||||
| -rwxr-xr-x | upgrade/update-init.sh | 15 |
5 files changed, 5 insertions, 16 deletions
diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index 8cfaef4..72d6cb6 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -201,6 +201,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} @@ -334,6 +335,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 15968ce..b6f1433 100644 --- 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 d211f0e..672a76a 100644 --- 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 ed00616..adc8f12 100644 --- 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 4974e9e..371abfe 100755 --- 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 |