Deleted Added
full compact
ufs.subr (253333) ufs.subr (256181)
1if [ ! "$_MEDIA_UFS_SUBR" ]; then _MEDIA_UFS_SUBR=1
2#
3# Copyright (c) 2012-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 (INCLUDING, 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 [ ! "$_MEDIA_UFS_SUBR" ]; then _MEDIA_UFS_SUBR=1
2#
3# Copyright (c) 2012-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 (INCLUDING, 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/media/ufs.subr 253333 2013-07-14 03:08:52Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/share/media/ufs.subr 256181 2013-10-09 08:12:26Z dteske $
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." media/ufs.subr
34f_include $BSDCFG_SHARE/device.subr
35f_include $BSDCFG_SHARE/dialog.subr

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

172# f_media_shutdown_ufs $device
173#
174# Shuts down the UFS device using umount(8). Return status should be ignored.
175#
176f_media_shutdown_ufs()
177{
178 local dev="$1" err
179
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." media/ufs.subr
34f_include $BSDCFG_SHARE/device.subr
35f_include $BSDCFG_SHARE/dialog.subr

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

172# f_media_shutdown_ufs $device
173#
174# Shuts down the UFS device using umount(8). Return status should be ignored.
175#
176f_media_shutdown_ufs()
177{
178 local dev="$1" err
179
180 [ "$UFS_MOUNTED" ] || return
180 [ "$UFS_MOUNTED" ] || return $FAILURE
181
182 if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
183 err="${err#umount: }"; err="${err#*: }"
184 f_show_msg "$msg_could_not_unmount_the_ufs_partition" \
185 "$MOUNTPOINT" "$err"
186 else
187 UFS_MOUNTED=
188 fi
189}
190
191############################################################ MAIN
192
193f_dprintf "%s: Successfully loaded." media/ufs.subr
194
195fi # ! $_MEDIA_UFS_SUBR
181
182 if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
183 err="${err#umount: }"; err="${err#*: }"
184 f_show_msg "$msg_could_not_unmount_the_ufs_partition" \
185 "$MOUNTPOINT" "$err"
186 else
187 UFS_MOUNTED=
188 fi
189}
190
191############################################################ MAIN
192
193f_dprintf "%s: Successfully loaded." media/ufs.subr
194
195fi # ! $_MEDIA_UFS_SUBR