better error codes to allow for diagnosing problems in recovery mode. fix system looking for sh in /system/bin/sh
diff --git a/extendedcommands.c b/extendedcommands.c
index 61b0252..1f32c49 100644
--- a/extendedcommands.c
+++ b/extendedcommands.c
@@ -16,6 +16,9 @@
#include <sys/limits.h>
#include <dirent.h>
+#include <signal.h>
+#include <sys/wait.h>
+
#include "bootloader.h"
#include "common.h"
#include "cutils/properties.h"
@@ -195,12 +198,54 @@
install_zip(sdcard_package_file);
}
+// This was pulled from bionic: The default system command always looks
+// for shell in /system/bin/sh. This is bad.
+#define _PATH_BSHELL "/sbin/sh"
+#define system recovery_system
+extern char **environ;
+int
+system(const char *command)
+{
+ pid_t pid;
+ sig_t intsave, quitsave;
+ sigset_t mask, omask;
+ int pstat;
+ char *argp[] = {"sh", "-c", NULL, NULL};
+
+ if (!command) /* just checking... */
+ return(1);
+
+ argp[2] = (char *)command;
+
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGCHLD);
+ sigprocmask(SIG_BLOCK, &mask, &omask);
+ switch (pid = vfork()) {
+ case -1: /* error */
+ sigprocmask(SIG_SETMASK, &omask, NULL);
+ return(-1);
+ case 0: /* child */
+ sigprocmask(SIG_SETMASK, &omask, NULL);
+ execve(_PATH_BSHELL, argp, environ);
+ _exit(127);
+ }
+
+ intsave = (sig_t) bsd_signal(SIGINT, SIG_IGN);
+ quitsave = (sig_t) bsd_signal(SIGQUIT, SIG_IGN);
+ pid = waitpid(pid, (int *)&pstat, 0);
+ sigprocmask(SIG_SETMASK, &omask, NULL);
+ (void)bsd_signal(SIGINT, intsave);
+ (void)bsd_signal(SIGQUIT, quitsave);
+ return (pid == -1 ? -1 : pstat);
+}
+
void do_nandroid_backup()
{
ui_print("Performing backup...\n");
- if (system("/sbin/nandroid-mobile.sh backup") != 0)
+ int ret = system("/sbin/nandroid-mobile.sh backup /sdcard/clockworkmod/backup/");
+ if (ret != 0)
{
- ui_print("Error while backing up!\n");
+ ui_print("Error while backing up! Error code: %d\n", ret);
return;
}
ui_print("Backup complete.\n");
diff --git a/nandroid/nandroid-mobile.sh b/nandroid/nandroid-mobile.sh
index 4f42241..6de3a8c 100755
--- a/nandroid/nandroid-mobile.sh
+++ b/nandroid/nandroid-mobile.sh
@@ -55,6 +55,7 @@
RECOVERY=foo
echo "nandroid-mobile v2.1"
+echo here > /etc/foo
mkfstab.sh > /etc/fstab
if [ "$1" == "" ]; then
@@ -79,7 +80,7 @@
dump_image=`which dump_image-arm-uclibc`
if [ "$dump_image" == "" ]; then
echo "error: dump_image or dump_image-arm-uclibc not found in path"
- exit 1
+ exit 2
fi
fi
break
@@ -90,13 +91,13 @@
flash_image=`which flash_image-arm-uclibc`
if [ "$flash_image" == "" ]; then
echo "error: flash_image or flash_image-arm-uclibc not found in path"
- exit 1
+ exit 3
fi
fi
unyaffs=`which unyaffs`
if [ "$unyaffs" == "" ]; then
echo "error: unyaffs not found in path"
- exit 1
+ exit 4
fi
break
;;
@@ -106,12 +107,12 @@
RECOVERY=`cat /proc/cmdline | grep "androidboot.mode=recovery"`
if [ "$RECOVERY" == "foo" ]; then
echo "error: not running in recovery mode, aborting"
- exit 1
+ exit 5
fi
if [ ! "`id -u 2>/dev/null`" == "0" ]; then
if [ "`whoami 2>&1 | grep 'uid 0'`" == "" ]; then
echo "error: must run as root, aborting"
- exit 1
+ exit 6
fi
fi
@@ -125,20 +126,20 @@
if [ ! $ENERGY -ge 30 ]; then
echo "Error: not enough battery power"
echo "Connect charger or USB power and try again"
- exit 1
+ exit 7
fi
RESTOREPATH=$2
if [ ! -f $RESTOREPATH/nandroid.md5 ]; then
echo "error: $RESTOREPATH/nandroid.md5 not found, cannot verify backup data"
- exit 1
+ exit 8
fi
umount /system 2>/dev/null
umount /data 2>/dev/null
mount -o rw /system || FAIL=1
mount -o rw /data || FAIL=2
case $FAIL in
- 1) echo "Error mounting system read-write"; umount /system /data /cache; exit 1;;
- 2) echo "Error mounting data read-write"; umount /system /data /cache; exit 1;;
+ 1) echo "Error mounting system read-write"; umount /system /data /cache; exit 9;;
+ 2) echo "Error mounting data read-write"; umount /system /data /cache; exit 10;;
esac
echo "Verifying backup images..."
@@ -147,7 +148,7 @@
md5sum -c nandroid.md5
if [ $? -eq 1 ]; then
echo "error: md5sum mismatch, aborting"
- exit 1
+ exit 11
fi
for image in boot; do
echo "Flashing $image..."
@@ -174,7 +175,7 @@
echo "Usage: $0 {backup|restore} [/path/to/nandroid/backup/]"
echo "- backup will store a full system backup on /sdcard/nandroid"
echo "- restore path will restore the last made backup for boot, system, recovery and data"
- exit 1
+ exit 12
;;
esac
@@ -185,16 +186,16 @@
umount /sdcard 2>/dev/null
mount -o ro /system || FAIL=1
mount -o ro /data || FAIL=2
-mount /sdcard || mount /dev/block/mmcblk0 /sdcard || FAIL=3
+mount /sdcard || FAIL=3
case $FAIL in
- 1) echo "Error mounting system read-only"; umount /system /data /sdcard; exit 1;;
- 2) echo "Error mounting data read-only"; umount /system /data /sdcard; exit 1;;
- 3) echo "Error mounting sdcard read-write"; umount /system /data /sdcard; exit 1;;
+ 1) echo "Error mounting system read-only"; umount /system /data /sdcard; exit 13;;
+ 2) echo "Error mounting data read-only"; umount /system /data /sdcard; exit 14;;
+ 3) echo "Error mounting sdcard read-write"; umount /system /data /sdcard; exit 15;;
esac
TIMESTAMP="`date +%Y%m%d-%H%M`"
BASEDIR=/sdcard/nandroid
-if [ !-z "$2" ]; then
+if [ ! -z "$2" ]; then
BASEDIR=$2
fi
@@ -206,7 +207,7 @@
umount /system 2>/dev/null
umount /data 2>/dev/null
umount /sdcard 2>/dev/null
- exit 1
+ exit 16
fi
else
touch $DESTDIR/.nandroidwritable
@@ -215,7 +216,7 @@
umount /system 2>/dev/null
umount /data 2>/dev/null
umount /sdcard 2>/dev/null
- exit 1
+ exit 16
fi
rm $DESTDIR/.nandroidwritable
fi
@@ -229,7 +230,7 @@
umount /system 2>/dev/null
umount /data 2>/dev/null
umount /sdcard 2>/dev/null
- exit 1
+ exit 17
fi
@@ -271,7 +272,7 @@
umount /system
umount /data
umount /sdcard
- exit 1
+ exit 18
fi
done
echo "done"