diff options
Diffstat (limited to 'trunk/src/simplaret')
| -rwxr-xr-x | trunk/src/simplaret | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/trunk/src/simplaret b/trunk/src/simplaret index 870fbf6..6ac93d7 100755 --- a/trunk/src/simplaret +++ b/trunk/src/simplaret @@ -718,13 +718,16 @@ function simplaret_get_jail_patches { function simplaret_get_patches { - local jailpath oldroot + local jailpath if [ "$1" == "--upgrade" ]; then IS_UPGRADE="1" fi - oldroot="$ROOT" + if [ ! -z "$ROOT" ]; then + simplaret_get_jail_patches $ROOT + return $? + fi # first get patches from the root system simplaret_get_jail_patches @@ -739,7 +742,7 @@ function simplaret_get_patches { done fi - ROOT="$oldroot" + ROOT="" } @@ -991,7 +994,7 @@ case $1 in "--purge" | "purge") shift ; simplaret_purge $* ;; "--install" | "install") shift ; simplaret_install $* ;; "--upgrade" | "upgrade") simplaret_get_patches --upgrade ;; - "--remove" | "remove") removepkg $2 ;; + "--remove" | "remove") ROOT=/$ROOT removepkg $2 ;; *) simplaret_usage ;; esac |