Patch for automated upgrade

The RW update had stopped after initialization for debugging.
This patch automates RW update but makes a short pause
after upgrade-init.
Developer can enter to debug mode by creating debug mode file
(/opt/usr/.upgdebug) during pausing.

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

diff --git a/packaging/system-rw-update.spec b/packaging/system-rw-update.spec
index 675f16ff36c6572eaef0ec082f62f2246274cc09..74ff7b336cc7af8ec2a9cf9ba3e668ba811fbb76 100644 (file)
--- a/packaging/system-rw-update.spec
+++ b/packaging/system-rw-update.spec
@@ -23,10 +23,8 @@ cp %{SOURCE1001} .
 mkdir -p %{buildroot}%{_datadir}
 cp -r upgrade %{buildroot}%{_datadir}
 mkdir -p %{buildroot}%{_unitdir}/system-update.target.wants
-install -m 644 units/init-update.service %{buildroot}%{_unitdir}
 install -m 644 units/offline-update.service %{buildroot}%{_unitdir}
-#ln -s ../offline-update.service %{buildroot}%{_unitdir}/system-update.target.wants/offline-update.service
-ln -s ../init-update.service %{buildroot}%{_unitdir}/system-update.target.wants
+ln -s ../offline-update.service %{buildroot}%{_unitdir}/system-update.target.wants/offline-update.service
 ln -s ../getty.target %{buildroot}%{_unitdir}/system-update.target.wants
 ln -s ../cynara.socket %{buildroot}%{_unitdir}/system-update.target.wants
 
@@ -50,6 +48,5 @@ fi
 %license LICENSE.Apache-2.0
 %{_datadir}/upgrade/*
 %{_unitdir}/offline-update.service
-%{_unitdir}/init-update.service
 %{_unitdir}/system-update.target.wants
 %{_unitdir}/udev-sdb-init.service

diff --git a/units/init-update.service b/units/init-update.service
deleted file mode 100644 (file)
index 713f9a9..0000000
--- a/units/init-update.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=System update initialize service
-DefaultDependencies=no
-Requires=sysinit.target
-After=sysinit.target
-Before=sdbd.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/share/upgrade/update-init.sh

diff --git a/units/offline-update.service b/units/offline-update.service
index 062085357f1142efc3826957f75f4061220c0b7b..0122075e29121a974912b5def61d3ef88acbfe1c 100644 (file)
--- a/units/offline-update.service
+++ b/units/offline-update.service
@@ -2,8 +2,8 @@
 Description=System update script service
 DefaultDependencies=no
 Requires=sysinit.target
-After=sysinit.target init-update.service
+After=sysinit.target
 
 [Service]
-Type=simple
-ExecStart=/usr/share/upgrade/update.sh
+Type=oneshot
+ExecStart=/usr/share/upgrade/update-init.sh

diff --git a/upgrade/update-init.sh b/upgrade/update-init.sh
index be6040683e47d6bc487a8e2f2968db448758378d..6825aeb37ea850a487d2c3f9ea93655fa76179db 100755 (executable)
--- a/upgrade/update-init.sh
+++ b/upgrade/update-init.sh
@@ -4,6 +4,8 @@
 #
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 RW_MACRO=/usr/share/upgrade/rw-update-macro.inc
+RW_UPDATE=/usr/share/upgrade/update.sh
+DEBUG_MODE=/opt/usr/.upgdebug
 
 if [ -f $RW_MACRO ]; then
        source $RW_MACRO
@@ -18,3 +20,10 @@ fi
 
 # Permission Update for shared directories
 /etc/gumd/useradd.d/91_user-dbspace-permissions.post owner
+
+sleep 10
+if [ -f $DEBUG_MODE ]; then
+       exit
+fi
+
+exec /bin/sh $RW_UPDATE