Deleted Added
full compact
mustberoot.subr (251266) mustberoot.subr (251274)
1if [ ! "$_MUSTBEROOT_SUBR" ]; then _MUSTBEROOT_SUBR=1
2#
3# Copyright (c) 2006-2013 Devin Teske
4# All Rights Reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

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

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
1if [ ! "$_MUSTBEROOT_SUBR" ]; then _MUSTBEROOT_SUBR=1
2#
3# Copyright (c) 2006-2013 Devin Teske
4# All Rights Reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

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

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
27# $FreeBSD: head/usr.sbin/bsdconfig/share/mustberoot.subr 251266 2013-06-02 22:34:40Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/share/mustberoot.subr 251274 2013-06-02 23:15:12Z dteske $
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." mustberoot.subr
34f_include $BSDCFG_SHARE/dialog.subr
35

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

171 --cancel-label "$msg_cancel" \
172 --password --inputbox "$prompt" \
173 $height $width \
174 2>&1 > /dev/null
175 )
176 retval=$?
177
178 # Catch X11-related errors
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." mustberoot.subr
34f_include $BSDCFG_SHARE/dialog.subr
35

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

171 --cancel-label "$msg_cancel" \
172 --password --inputbox "$prompt" \
173 $height $width \
174 2>&1 > /dev/null
175 )
176 retval=$?
177
178 # Catch X11-related errors
179 [ $retval -eq 255 ] &&
179 if [ $retval -eq 255 ]; then
180 f_die $retval "$password"
180 f_die $retval "$password"
181 elif [ $retval -ne 0 ]; then
182 # User cancelled
183 exit $retval
184 fi
181 else
182 password=$( $DIALOG \
183 --title "$DIALOG_TITLE" \
184 --backtitle "$DIALOG_BACKTITLE" \
185 --hline "$hline" \
186 --ok-label "$msg_ok" \
187 --cancel-label "$msg_cancel" \
188 --insecure \

--- 233 unchanged lines hidden ---
185 else
186 password=$( $DIALOG \
187 --title "$DIALOG_TITLE" \
188 --backtitle "$DIALOG_BACKTITLE" \
189 --hline "$hline" \
190 --ok-label "$msg_ok" \
191 --cancel-label "$msg_cancel" \
192 --insecure \

--- 233 unchanged lines hidden ---