diff options
| -rwxr-xr-x | upgrade/update-init.sh | 13 | ||||
| -rwxr-xr-x | upgrade/update-post.sh | 30 | ||||
| -rwxr-xr-x | upgrade/update.sh | 2 |
3 files changed, 2 insertions, 43 deletions
diff --git a/upgrade/update-init.sh b/upgrade/update-init.sh index 3d0a499..79934e4 100755 --- a/upgrade/update-init.sh +++ b/upgrade/update-init.sh @@ -27,24 +27,15 @@ cp -af /usr/share/upgrade/data/rpm/* /var/lib/rpm # For sdb debugging +/usr/share/upgrade/scripts/000.filesystem-pre.patch.sh /usr/share/upgrade/scripts/010.tizen-platform-config.patch.sh /usr/share/upgrade/scripts/011.dlog_upgrade.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/000.filesystem-pre.patch.sh /usr/share/upgrade mv /usr/share/upgrade/scripts/010.tizen-platform-config.patch.sh /usr/share/upgrade mv /usr/share/upgrade/scripts/011.dlog_upgrade.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 -ln -snf /run/lock /var/lock - -# Directory for compatibility -chown root:root /opt/usr/media -chsmack -a '_' -T /opt/usr/media -# The operation done by generic-base.post -chown root:root /opt/var/log -chsmack -a '*' -t /opt/var/log diff --git a/upgrade/update-post.sh b/upgrade/update-post.sh deleted file mode 100755 index 11fc065..0000000 --- a/upgrade/update-post.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# RW update post script -# -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -rm -rf /opt/usr/live -rm -rf /opt/driver -rm -rf /opt/storage - -# Migrate user contents to 3.0 path -. /etc/tizen-platform.conf -export `tzplatform-get --user $TZ_SYS_DEFAULT_USER TZ_USER_CONTENT` -CONTENTS24=/opt/usr/media -CONTENTS30=$TZ_USER_CONTENT - -cp -rT --preserve=mode,timestamps $CONTENTS24/DCIM $CONTENTS30/Camera -cp -rT --preserve=mode,timestamps $CONTENTS24/Documents $CONTENTS30/Documents -cp -rT --preserve=mode,timestamps $CONTENTS24/Downloads $CONTENTS30/Downloads -cp -rT --preserve=mode,timestamps $CONTENTS24/Images $CONTENTS30/Images -cp -rT --preserve=mode,timestamps $CONTENTS24/Music $CONTENTS30/Music -cp -rT --preserve=mode,timestamps $CONTENTS24/Others $CONTENTS30/Others -cp -rT --preserve=mode,timestamps $CONTENTS24/Sounds $CONTENTS30/Sounds -cp -rT --preserve=mode,timestamps $CONTENTS24/Videos $CONTENTS30/Videos - -# Remove remain garbage files -rm -rf /opt/usr/media -mkdir -m 755 /opt/usr/media -chsmack -a '_' /opt/usr/media -rm -rf /opt/home/app diff --git a/upgrade/update.sh b/upgrade/update.sh index 641500c..0985749 100755 --- a/upgrade/update.sh +++ b/upgrade/update.sh @@ -23,8 +23,6 @@ else ${RUN} ${PATCH_DIR}/${PATCH} done - ${RUN} /usr/share/upgrade/update-post.sh - sync echo "SUCCESS: Upgrade successfully finished" > ${RESULT_FILE} |