Deleted Added
full compact
functions.sh (235005) functions.sh (235453)
1#!/bin/sh
2#-
3# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
4#
5# Redistribution and use in source and binary forms, with or without
6# modification, are permitted provided that the following conditions
7# are met:
8# 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24# SUCH DAMAGE.
25#
1#!/bin/sh
2#-
3# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
4#
5# Redistribution and use in source and binary forms, with or without
6# modification, are permitted provided that the following conditions
7# are met:
8# 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24# SUCH DAMAGE.
25#
26# $FreeBSD: head/usr.sbin/pc-sysinstall/backend/functions.sh 235005 2012-05-04 15:31:35Z jpaetzel $
26# $FreeBSD: head/usr.sbin/pc-sysinstall/backend/functions.sh 235453 2012-05-14 18:06:51Z jpaetzel $
27
28# functions.sh
29# Library of functions which pc-sysinstall may call upon
30
31# Function which displays the help-index file
32display_help()
33{
34 if [ -e "${PROGDIR}/doc/help-index" ]

--- 168 unchanged lines hidden (view full) ---

203# Function which uses "fetch" to download a file, and display a progress report
204fetch_file()
205{
206
207 FETCHFILE="$1"
208 FETCHOUTFILE="$2"
209 EXITFAILED="$3"
210
27
28# functions.sh
29# Library of functions which pc-sysinstall may call upon
30
31# Function which displays the help-index file
32display_help()
33{
34 if [ -e "${PROGDIR}/doc/help-index" ]

--- 168 unchanged lines hidden (view full) ---

203# Function which uses "fetch" to download a file, and display a progress report
204fetch_file()
205{
206
207 FETCHFILE="$1"
208 FETCHOUTFILE="$2"
209 EXITFAILED="$3"
210
211 SIZEFILE="${TMPDIR}/.fetchSize"
212 EXITFILE="${TMPDIR}/.fetchExit"
213
211 EXITFILE="${TMPDIR}/.fetchExit"
212
214 rm ${SIZEFILE} 2>/dev/null >/dev/null
215 rm ${FETCHOUTFILE} 2>/dev/null >/dev/null
216
213 rm ${FETCHOUTFILE} 2>/dev/null >/dev/null
214
217 fetch -s "${FETCHFILE}" >${SIZEFILE}
218 SIZE="`cat ${SIZEFILE}`"
219 SIZE=$((SIZE/1024))
215 SIZE=$(( `fetch -s "${FETCHFILE}"` / 1024 ))
220 echo "FETCH: ${FETCHFILE}"
221 echo "FETCH: ${FETCHOUTFILE}" >>${LOGOUT}
222
223 ( fetch -o ${FETCHOUTFILE} "${FETCHFILE}" >/dev/null 2>/dev/null ; echo "$?" > ${EXITFILE} ) &
224 PID="$!"
225 while
226 z=1
227 do

--- 45 unchanged lines hidden (view full) ---

273 if [ -e "${TMPDIR}/.zpools/${DEVICE}" ] ; then
274 cat ${TMPDIR}/.zpools/${DEVICE}
275 return 0
276 else
277 # Need to generate a zpool name for this device
278 NUM=`ls ${TMPDIR}/.zpools/ | wc -l | sed 's| ||g'`
279
280 # Is it used in another zpool?
216 echo "FETCH: ${FETCHFILE}"
217 echo "FETCH: ${FETCHOUTFILE}" >>${LOGOUT}
218
219 ( fetch -o ${FETCHOUTFILE} "${FETCHFILE}" >/dev/null 2>/dev/null ; echo "$?" > ${EXITFILE} ) &
220 PID="$!"
221 while
222 z=1
223 do

--- 45 unchanged lines hidden (view full) ---

269 if [ -e "${TMPDIR}/.zpools/${DEVICE}" ] ; then
270 cat ${TMPDIR}/.zpools/${DEVICE}
271 return 0
272 else
273 # Need to generate a zpool name for this device
274 NUM=`ls ${TMPDIR}/.zpools/ | wc -l | sed 's| ||g'`
275
276 # Is it used in another zpool?
281 while
282 z=1
277 while :
283 do
284 NEWNAME="${BASENAME}${NUM}"
278 do
279 NEWNAME="${BASENAME}${NUM}"
285 zpool import | grep -q "${NEWNAME}"
286 if [ $? -ne 0 ] ; then break ; fi
280 zpool import | grep -qw "${NEWNAME}" && break
287 NUM=$((NUM+1))
288 done
289
290 # Now save the new tank name
291 mkdir -p ${TMPDIR}/.zpools/`dirname $DEVICE`
292 echo "$NEWNAME" >${TMPDIR}/.zpools/${DEVICE}
293 echo "${NEWNAME}"
294 return 0

--- 248 unchanged lines hidden ---
281 NUM=$((NUM+1))
282 done
283
284 # Now save the new tank name
285 mkdir -p ${TMPDIR}/.zpools/`dirname $DEVICE`
286 echo "$NEWNAME" >${TMPDIR}/.zpools/${DEVICE}
287 echo "${NEWNAME}"
288 return 0

--- 248 unchanged lines hidden ---