libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switched releng/manual_devices from -devices to -device_links

Browse Source
This commit is contained in:
Thomas Schmitt 2011-07-27 21:43:24 +00:00
parent 83d1a68a05
commit 2138a4a7f6
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libisoburn/trunk/releng/manual_devices
View File

@ -65,6 +65,14 @@ done
# Insist in having a xorriso # Insist in having a xorriso
check_for_xorriso -x check_for_xorriso -x
has_device_links=$("$RELENG_XORRISO" -help 2>/dev/null | fgrep ' -device_links')
if test -n "$has_device_links"
then
devices_opt="-device_links"
else
devices_opt="-devices"
fi
# #
get_speeds() { get_speeds() {
echo -e "\n${SELF}: Running: ${RELENG_XORRISO} -report_about WARNING -outdev ${1} -toc -list_formats -list_profiles out -list_speeds" echo -e "\n${SELF}: Running: ${RELENG_XORRISO} -report_about WARNING -outdev ${1} -toc -list_formats -list_profiles out -list_speeds"
@ -83,14 +91,14 @@ $1
} }
get_devices() { get_devices() {
# $1 = if not empty: device lines from xorriso -devices # $1 = if not empty: device lines from xorriso -devices or -device_links
# $2 = if not empty: suppress dialog and use $2 as input # $2 = if not empty: suppress dialog and use $2 as input
if test -n "$1" if test -n "$1"
then then
DEVICES="$1" DEVICES="$1"
else else
DEVICES=$("$RELENG_XORRISO" -devices 2>/dev/null | grep "\-dev") DEVICES=$("$RELENG_XORRISO" $devices_opt 2>/dev/null | grep "\-dev")
fi fi
NUM_DEV=$(cat_var "$DEVICES" | wc -l) NUM_DEV=$(cat_var "$DEVICES" | wc -l)
case "${NUM_DEV}" in case "${NUM_DEV}" in
@ -133,8 +141,8 @@ get_devices() {
# main # main
"$RELENG_XORRISO" -version "$RELENG_XORRISO" -version
echo -e "\n${SELF}: Running: $RELENG_XORRISO -devices..." echo -e "\n${SELF}: Running: $RELENG_XORRISO $devices_opt ..."
devices=$("$RELENG_XORRISO" -report_about WARNING -devices | grep "\-dev") devices=$("$RELENG_XORRISO" -report_about WARNING $devices_opt | grep "\-dev")
RET="$?" RET="$?"
if test "$SIMULATE_FAILURE" = 1 if test "$SIMULATE_FAILURE" = 1
then then
@ -157,7 +165,7 @@ case ${RET} in
;; ;;
*) *)
boldify boldify
echo -ne "\n${SELF}: ${RELENG_XORRISO} -devices returned ${RET}." echo -ne "\n${SELF}: ${RELENG_XORRISO} $devices_opt returned ${RET}."
unboldify unboldify
echo -e "\n${SELF}: Already mounted?" echo -e "\n${SELF}: Already mounted?"
df -kh df -kh