Reorganize Vendor and Restore Backuptool
diff --git a/prebuilt/common/bin/50-base.sh b/prebuilt/common/bin/50-base.sh
new file mode 100644
index 0000000..638d52d
--- /dev/null
+++ b/prebuilt/common/bin/50-base.sh
@@ -0,0 +1,41 @@
+#!/sbin/sh
+#
+# /system/addon.d/50-base.sh
+# During a CM11 upgrade, this script backs up /system/etc/hosts,
+# /system is formatted and reinstalled, then the file is restored.
+#
+
+. /tmp/backuptool.functions
+
+list_files() {
+cat <<EOF
+etc/hosts
+EOF
+}
+
+case "$1" in
+ backup)
+ list_files | while read FILE DUMMY; do
+ backup_file $S/"$FILE"
+ done
+ ;;
+ restore)
+ list_files | while read FILE REPLACEMENT; do
+ R=""
+ [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
+ [ -f "$C/$S/$FILE" ] && restore_file $S/"$FILE" "$R"
+ done
+ ;;
+ pre-backup)
+ # Stub
+ ;;
+ post-backup)
+ # Stub
+ ;;
+ pre-restore)
+ # Stub
+ ;;
+ post-restore)
+ # Stub
+ ;;
+esac
diff --git a/prebuilt/common/bin/backuptool.functions b/prebuilt/common/bin/backuptool.functions
new file mode 100644
index 0000000..9e9c756
--- /dev/null
+++ b/prebuilt/common/bin/backuptool.functions
@@ -0,0 +1,37 @@
+#!/sbin/sh
+#
+# Functions for backuptool.sh
+#
+
+export C=/tmp/backupdir
+export S=/system
+export V=5
+
+backup_file() {
+ if [ -e "$1" ]; then
+ local F=`basename "$1"`
+ local D=`dirname "$1"`
+ # dont backup any apps that have odex files, they are useless
+ if ( echo "$F" | grep -q "\.apk$" ) && [ -e `echo "$1" | sed -e 's/\.apk$/\.odex/'` ]; then
+ echo "Skipping odexed apk $1";
+ else
+ mkdir -p "$C/$D"
+ cp -p $1 "$C/$D/$F"
+ fi
+ fi
+}
+
+restore_file() {
+ local FILE=`basename "$1"`
+ local DIR=`dirname "$1"`
+ if [ -e "$C/$DIR/$FILE" ]; then
+ if [ ! -d "$DIR" ]; then
+ mkdir -p "$DIR";
+ fi
+ cp -p "$C/$DIR/$FILE" "$1";
+ if [ -n "$2" ]; then
+ echo "Deleting obsolete file $2"
+ rm "$2";
+ fi
+ fi
+}
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
new file mode 100644
index 0000000..ec5d64a
--- /dev/null
+++ b/prebuilt/common/bin/backuptool.sh
@@ -0,0 +1,101 @@
+#!/sbin/sh
+#
+# Backup and restore addon /system files
+#
+
+export C=/tmp/backupdir
+export S=/system
+export V=5
+
+# Preserve /system/addon.d in /tmp/addon.d
+preserve_addon_d() {
+ mkdir -p /tmp/addon.d/
+ cp -a /system/addon.d/* /tmp/addon.d/
+ chmod 755 /tmp/addon.d/*.sh
+}
+
+# Restore /system/addon.d in /tmp/addon.d
+restore_addon_d() {
+ cp -a /tmp/addon.d/* /system/addon.d/
+ rm -rf /tmp/addon.d/
+}
+
+# Proceed only if /system is the expected major and minor version
+check_prereq() {
+if ( ! grep -q "^ro.build.version.release=$V.*" /system/build.prop ); then
+ echo "Not backing up files from incompatible version: $V"
+ return 0
+fi
+return 1
+}
+
+check_blacklist() {
+ if [ -f /system/addon.d/blacklist ];then
+ ## Discard any known bad backup scripts
+ cd /$1/addon.d/
+ for f in *sh; do
+ s=$(md5sum $f | awk {'print $1'})
+ grep -q $s /system/addon.d/blacklist && rm -f $f
+ done
+ fi
+}
+
+check_whitelist() {
+ found=0
+ if [ -f /system/addon.d/whitelist ];then
+ ## forcefully keep any version-independent stuff
+ cd /$1/addon.d/
+ for f in *sh; do
+ s=$(md5sum $f | awk {'print $1'})
+ grep -q $s /system/addon.d/whitelist
+ if [ $? -eq 0 ]; then
+ found=1
+ else
+ rm -f $f
+ fi
+ done
+ fi
+ return $found
+}
+
+# Execute /system/addon.d/*.sh scripts with $1 parameter
+run_stage() {
+for script in $(find /tmp/addon.d/ -name '*.sh' |sort -n); do
+ $script $1
+done
+}
+
+case "$1" in
+ backup)
+ mkdir -p $C
+ if check_prereq; then
+ if check_whitelist system; then
+ exit 127
+ fi
+ fi
+ check_blacklist system
+ preserve_addon_d
+ run_stage pre-backup
+ run_stage backup
+ run_stage post-backup
+ ;;
+ restore)
+ if check_prereq; then
+ if check_whitelist tmp; then
+ exit 127
+ fi
+ fi
+ check_blacklist tmp
+ run_stage pre-restore
+ run_stage restore
+ run_stage post-restore
+ restore_addon_d
+ rm -rf $C
+ sync
+ ;;
+ *)
+ echo "Usage: $0 {backup|restore}"
+ exit 1
+esac
+
+exit 0
diff --git a/prebuilt/common/etc/init.d/00banner b/prebuilt/common/etc/init.d/00banner
new file mode 100644
index 0000000..c028585
--- /dev/null
+++ b/prebuilt/common/etc/init.d/00banner
@@ -0,0 +1,7 @@
+#!/system/bin/sh
+#
+# Print startup info
+#
+L="log -p i -t aosp"
+
+$L "Welcome to Android `getprop ro.build.version.release` / The Android Open Source Project";
diff --git a/prebuilt/common/etc/init.d/90userinit b/prebuilt/common/etc/init.d/90userinit
new file mode 100644
index 0000000..e8e6de0
--- /dev/null
+++ b/prebuilt/common/etc/init.d/90userinit
@@ -0,0 +1,15 @@
+#!/system/bin/sh
+# call userinit.sh and/or userinit.d/* scripts if present in /data/local
+
+if [ -e /data/local/userinit.sh ];
+then
+ log -p i -t userinit "Executing /data/local/userinit.sh";
+ logwrapper /system/bin/sh /data/local/userinit.sh;
+ setprop cm.userinit.active 1;
+fi;
+
+if [ -d /data/local/userinit.d ];
+then
+ logwrapper busybox run-parts /data/local/userinit.d;
+ setprop cm.userinit.active 1;
+fi;