diff options
author | erdgeist <erdgeist@erdgeist.org> | 2005-09-20 22:30:40 +0000 |
---|---|---|
committer | erdgeist <erdgeist@erdgeist.org> | 2005-09-20 22:30:40 +0000 |
commit | 853963f7d15b90da817f08f72f95829f491f11ab (patch) | |
tree | 37704aa540474ad6366960a76dfe08d6a5549306 /ezjail-admin | |
parent | c753f5fd6e412a5b19f29d44d0c121b2a2f041b4 (diff) |
Honour the install only flag in update
Diffstat (limited to 'ezjail-admin')
-rwxr-xr-x | ezjail-admin | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/ezjail-admin b/ezjail-admin index 324168f..b6ba4dc 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -126,6 +126,22 @@ list) | |||
126 | 126 | ||
127 | ;; | 127 | ;; |
128 | update) | 128 | update) |
129 | shift | ||
130 | args=`getopt is: $*` | ||
131 | if [ $? != 0 ]; then | ||
132 | echo 'Usage: ezjail update [-s sourcetree] [-i]'; | ||
133 | exit 1; | ||
134 | fi | ||
135 | |||
136 | updatejail_installaction=world | ||
137 | |||
138 | for arg in args; do | ||
139 | case $arg in | ||
140 | -i) updatejail_installaction=installworld; shift;; | ||
141 | -s) ezjail_sourcetree="$2"; shift 2;; | ||
142 | --) shift; break;; | ||
143 | esac | ||
144 | done; | ||
129 | 145 | ||
130 | if [ ! -d ${ezjail_sourcetree} ]; then | 146 | if [ ! -d ${ezjail_sourcetree} ]; then |
131 | echo "Cannot find your copy of the FreeBSD source tree in $ezjail_sourcetree."; exit 1; | 147 | echo "Cannot find your copy of the FreeBSD source tree in $ezjail_sourcetree."; exit 1; |
@@ -133,7 +149,7 @@ update) | |||
133 | 149 | ||
134 | cd ${ezjail_sourcetree} | 150 | cd ${ezjail_sourcetree} |
135 | rm -r ${ezjail_jailfull}; mkdir -p ${ezjail_jailfull} | 151 | rm -r ${ezjail_jailfull}; mkdir -p ${ezjail_jailfull} |
136 | make world DESTDIR=${ezjail_jailfull} | 152 | make ${updatejail_installaction} DESTDIR=${ezjail_jailfull} |
137 | make distribution DESTDIR=${ezjail_jailfull} | 153 | make distribution DESTDIR=${ezjail_jailfull} |
138 | 154 | ||
139 | cd ${ezjail_jailfull} | 155 | cd ${ezjail_jailfull} |