Deleted Added
full compact
usb.subr (252077) usb.subr (252721)
1if [ ! "$_MEDIA_USB_SUBR" ]; then _MEDIA_USB_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 (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 [ ! "$_MEDIA_USB_SUBR" ]; then _MEDIA_USB_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 (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/media/usb.subr 252077 2013-06-21 23:13:55Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/share/media/usb.subr 252721 2013-07-04 20:12:12Z dteske $
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." media/usb.subr
34f_include $BSDCFG_SHARE/device.subr
35f_include $BSDCFG_SHARE/dialog.subr

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

130 f_show_msg "$msg_error_mounting_usb_drive" \
131 "$devname" "$MOUNTPOINT" "$err"
132 return $FAILURE
133}
134
135# f_media_get_usb $device $file [$probe_only]
136#
137# Returns data from $file on a mounted USB disk device. Similar to cat(1).
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." media/usb.subr
34f_include $BSDCFG_SHARE/device.subr
35f_include $BSDCFG_SHARE/dialog.subr

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

130 f_show_msg "$msg_error_mounting_usb_drive" \
131 "$devname" "$MOUNTPOINT" "$err"
132 return $FAILURE
133}
134
135# f_media_get_usb $device $file [$probe_only]
136#
137# Returns data from $file on a mounted USB disk device. Similar to cat(1).
138# $probe_only is currently unused by this media type.
138# If $probe_only is present and non-NULL, returns success if $file exists.
139#
140f_media_get_usb()
141{
142 local dev="$1" file="$2" probe_only="$3"
143
144 f_dprintf "f_media_get_usb: dev=[%s] file=[%s] probe_only=%s" \
145 "$dev" "$file" "$probe_only"
146
139#
140f_media_get_usb()
141{
142 local dev="$1" file="$2" probe_only="$3"
143
144 f_dprintf "f_media_get_usb: dev=[%s] file=[%s] probe_only=%s" \
145 "$dev" "$file" "$probe_only"
146
147 f_media_generic_get "$MOUNTPOINT" "$file"
147 f_media_generic_get "$MOUNTPOINT" "$file" "$probe_only"
148}
149
150# f_media_shutdown_usb $device
151#
152# Shuts down the USB disk device using umount(8). Return status should be
153# ignored.
154#
155f_media_shutdown_usb()

--- 19 unchanged lines hidden ---
148}
149
150# f_media_shutdown_usb $device
151#
152# Shuts down the USB disk device using umount(8). Return status should be
153# ignored.
154#
155f_media_shutdown_usb()

--- 19 unchanged lines hidden ---