From: Sunmin Lee <sunm.lee@samsung.com>
Date: Tue, 22 Nov 2016 11:53:49 +0000 (+0900)
Subject: upgrade: back up default home directory
X-Git-Tag: submit/tizen_3.0/20161124.103638~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=104bafca6965b39730d44b43c5ea39400e818e10;p=platform%2Fadaptation%2Fsystem-plugin.git

upgrade: back up default home directory

The default user (owner) home directory is backed up when
image is created and moved back to /home at update-init.sh,
because previous gum-utils seems to have some dependency issue.

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

diff --git a/upgrade/update-image.sh b/upgrade/update-image.sh
index fd20bcf..27441bc 100755
--- a/upgrade/update-image.sh
+++ b/upgrade/update-image.sh
@@ -3,9 +3,13 @@
 # Modify normal image to upgrade image
 #
 
-# Back rpm db up for Tizen 3.0
-mkdir /system-update/data/rpm
-cp -arf /var/lib/rpm/* /system-update/data/rpm
+# Back up rpm db for Tizen 3.0
+mkdir /usr/share/upgrade/data/rpm
+cp -af /var/lib/rpm/* /usr/share/upgrade/data/rpm
+
+# Back up default user home directory
+mkdir /usr/share/upgrade/data/home
+cp -af /home/owner /usr/share/upgrade/data/home
 
 # remove RW partitions' files
 rm -rf /opt/*
diff --git a/upgrade/update-init.sh b/upgrade/update-init.sh
index 43e33ad..d27697e 100755
--- a/upgrade/update-init.sh
+++ b/upgrade/update-init.sh
@@ -18,12 +18,11 @@ fi
 
 # Create home directory
 test ! -e /opt/usr/home && mkdir -p /opt/usr/home
-
-gum-utils --offline -u --uid 5001
+cp -af /usr/share/upgrade/data/home/owner /opt/usr/home
 
 # Copy 3.0 rpm db
 rm -rf /var/lib/rpm/*
-cp -arf /system-update/data/rpm/* /var/lib/rpm
+cp -af /usr/share/upgrade/data/rpm/* /var/lib/rpm
 
 # Disable cynara-check
 buxton2ctl security-disable
diff --git a/upgrade/update.sh b/upgrade/update.sh
index a4d3534..8a6b807 100755
--- a/upgrade/update.sh
+++ b/upgrade/update.sh
@@ -29,4 +29,4 @@ else
 fi
 
 # Reboot
-systemctl reboot
+reboot -f