Author: pebender
Date: Mon Sep 1 15:42:38 2008
New Revision: 3689
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/functions
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_DHCP
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/master
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/mythtv
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/video
Log:
- Fixed bug that caused hostname '' to be '?', causing retrieval of
MiniMyth configuration files to fail.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Mon Sep 1
15:42:38 2008
@@ -52,6 +52,8 @@
on shutdown.
- Fixed bug in format of the default MM_CODECS_URL value.
- Fixed bug in format of the default MM_EXTRAS_URL value.
+ - Fixed bug that caused hostname '' to be '?', causing retrieval of
+ MiniMyth configuration files to fail.
Modified build system
- Added gar-minimyth-<version>.tar.bz2 to the root file system image so
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/functions
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/functions
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/functions
Mon Sep 1 15:42:38 2008
@@ -45,6 +45,17 @@
return
}
+mm_hostname() {
+
+ local HOSTNAME=`/bin/hostname`
+
+ if /usr/bin/test "${HOSTNAME}" = '?' ; then
+ HOSTNAME=''
+ fi
+
+ /bin/echo "${HOSTNAME}"
+}
+
#===============================================================================
# minimyth.conf functions.
#===============================================================================
@@ -111,17 +122,17 @@
local LOCAL_FILE=$1
local REMOTE_FILE=$2
- local HOST_NAME
+ local HOSTNAME
local REMOTE_FILE_0
local REMOTE_FILE_1
- HOST_NAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
LOCAL_FILE=`/bin/echo "${LOCAL_FILE}" | /bin/sed -e 's%//*%/%g' |
/bin/sed -e 's%/$%%'`
REMOTE_FILE=`/bin/echo "${REMOTE_FILE}" | /bin/sed -e 's%//*%/%g' |
/bin/sed -e 's%/$%%'`
REMOTE_FILE=`/bin/echo "${REMOTE_FILE}" | /bin/sed -e 's%^/%%'`
- if /usr/bin/test -n "${HOST_NAME}" ; then
- REMOTE_FILE_0="conf/${HOST_NAME}/${REMOTE_FILE}"
+ if /usr/bin/test -n "${HOSTNAME}" ; then
+ REMOTE_FILE_0="conf/${HOSTNAME}/${REMOTE_FILE}"
fi
REMOTE_FILE_1="conf/default/${REMOTE_FILE}"
@@ -141,18 +152,18 @@
local LOCAL_FILE=$1
local REMOTE_FILE=$2
- local HOST_NAME
+ local HOSTNAME
local REMOTE_FILE_0
- HOST_NAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
LOCAL_FILE=`/bin/echo "${LOCAL_FILE}" | /bin/sed -e 's%//*%/%g' |
/bin/sed -e 's%/$%%'`
REMOTE_FILE=`/bin/echo "${REMOTE_FILE}" | /bin/sed -e 's%//*%/%g' |
/bin/sed -e 's%/$%%'`
REMOTE_FILE=`/bin/echo "${REMOTE_FILE}" | /bin/sed -e 's%^/%%'`
- if /usr/bin/test -n "${HOST_NAME}" ; then
+ if /usr/bin/test -n "${HOSTNAME}" ; then
REMOTE_FILE_0=`/bin/echo ${REMOTE_FILE} \
| /bin/sed -e 's%/%+%'`
- REMOTE_FILE_0="conf-rw/${HOST_NAME}+${REMOTE_FILE_0}"
+ REMOTE_FILE_0="conf-rw/${HOSTNAME}+${REMOTE_FILE_0}"
fi
/bin/rm -f "${LOCAL_FILE}"
@@ -317,10 +328,10 @@
local LOCAL_FILE=$1
local REMOTE_FILE=$2
- local HOST_NAME
+ local HOSTNAME
local REMOTE_FILE_0
- HOST_NAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
if /usr/bin/test ! -f "${LOCAL_FILE}" ; then
/usr/bin/logger -s -t minimyth -p "local0.error" \
@@ -328,7 +339,7 @@
/bin/false
return
fi
- if /usr/bin/test -z "${HOST_NAME}" ; then
+ if /usr/bin/test -z "${HOSTNAME}" ; then
/usr/bin/logger -s -t minimyth -p "local0.error" \
"cannot post conf file '${LOCAL_FILE}' because hostname is
unknown."
/bin/false
@@ -338,10 +349,10 @@
LOCAL_FILE=`/bin/echo "${LOCAL_FILE}" | /bin/sed -e 's%//*%/%g' |
/bin/sed -e 's%/$%%'`
REMOTE_FILE=`/bin/echo "${REMOTE_FILE}" | /bin/sed -e 's%//*%/%g' |
/bin/sed -e 's%/$%%'`
REMOTE_FILE=`/bin/echo "${REMOTE_FILE}" | /bin/sed -e 's%^/%%'`
- if /usr/bin/test -n "${HOST_NAME}" ; then
+ if /usr/bin/test -n "${HOSTNAME}" ; then
REMOTE_FILE_0=`/bin/echo ${REMOTE_FILE} \
| /bin/sed -e 's%/%+%'`
- REMOTE_FILE_0="conf-rw/${HOST_NAME}+${REMOTE_FILE_0}"
+ REMOTE_FILE_0="conf-rw/${HOSTNAME}+${REMOTE_FILE_0}"
fi
( /usr/bin/test -n "${REMOTE_FILE_0}" \
@@ -1222,32 +1233,32 @@
mm_mythdb_jumppoints_delete() {
local DESTINATION=$1
- local HOST_NAME
+ local HOSTNAME
- HOST_NAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
if /usr/bin/test -n "${DESTINATION}" ; then
mm_mythdb_set "DELETE FROM jumppoints \
- WHERE hostname=\"${HOST_NAME}\" AND
destination=\"${DESTINATION}\""
+ WHERE hostname=\"${HOSTNAME}\" AND
destination=\"${DESTINATION}\""
else
mm_mythdb_set "DELETE FROM jumppoints \
- WHERE hostname=\"${HOST_NAME}\""
+ WHERE hostname=\"${HOSTNAME}\""
fi
}
mm_mythdb_jumppoints_dump() {
local DESTINATION=$1
- local HOST_NAME
+ local HOSTNAME
- HOST_NAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
if /usr/bin/test -n "${DESTINATION}" ; then
mm_mythdb_get "SELECT * FROM jumppoints \
- WHERE hostname=\"${HOST_NAME}\" AND
destination=\"${DESTINATION}\""
+ WHERE hostname=\"${HOSTNAME}\" AND
destination=\"${DESTINATION}\""
else
mm_mythdb_get "SELECT * FROM jumppoints \
- WHERE hostname=\"${HOST_NAME}\""
+ WHERE hostname=\"${HOSTNAME}\""
fi
}
@@ -1255,12 +1266,12 @@
local DESTINATION=$1
local KEYLIST=$2
- local HOST_NAME
+ local HOSTNAME
- HOST_NAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
mm_mythdb_set "UPDATE jumppoints SET keylist=\"${KEYLIST}\" \
- WHERE hostname=\"${HOST_NAME}\" AND destination=\"${DESTINATION}\""
+ WHERE hostname=\"${HOSTNAME}\" AND destination=\"${DESTINATION}\""
}
mm_mythdb_jumppoints_get() {
@@ -1277,19 +1288,19 @@
local CONTEXT=$1
local ACTION=$2
- local HOST_NAME
+ local HOSTNAME
- HOST_NAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
if /usr/bin/test -n "${CONTEXT}" && /usr/bin/test -n "${ACTION}" ;
then
mm_mythdb_set "DELETE FROM keybindings \
- WHERE hostname=\"${HOST_NAME}\" AND context=\"${CONTEXT}\" AND
action=\"${ACTION}\""
+ WHERE hostname=\"${HOSTNAME}\" AND context=\"${CONTEXT}\" AND
action=\"${ACTION}\""
elif /usr/bin/test -n "${CONTEXT}" ; then
mm_mythdb_set "DELETE FROM keybindings \
- WHERE hostname=\"${HOST_NAME}\" AND context=\"${CONTEXT}\""
+ WHERE hostname=\"${HOSTNAME}\" AND context=\"${CONTEXT}\""
else
mm_mythdb_set "DELETE FROM keybindings \
- WHERE hostname=\"${HOST_NAME}\""
+ WHERE hostname=\"${HOSTNAME}\""
fi
}
@@ -1297,19 +1308,19 @@
local CONTEXT=$1
local ACTION=$2
- local HOST_NAME
+ local HOSTNAME
- HOST_NAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
if /usr/bin/test -n "${CONTEXT}" && /usr/bin/test -n "${ACTION}" ;
then
mm_mythdb_get "SELECT * FROM keybindings \
- WHERE hostname=\"${HOST_NAME}\" AND context=\"${CONTEXT}\" AND
action=\"${ACTION}\""
+ WHERE hostname=\"${HOSTNAME}\" AND context=\"${CONTEXT}\" AND
action=\"${ACTION}\""
elif /usr/bin/test -n "${CONTEXT}" ; then
mm_mythdb_get "SELECT * FROM keybindings \
- WHERE hostname=\"${HOST_NAME}\" AND context=\"${CONTEXT}\""
+ WHERE hostname=\"${HOSTNAME}\" AND context=\"${CONTEXT}\""
else
mm_mythdb_get "SELECT * FROM keybindings \
- WHERE hostname=\"${HOST_NAME}\""
+ WHERE hostname=\"${HOSTNAME}\""
fi
}
@@ -1318,12 +1329,12 @@
local ACTION=$2
local KEYLIST=$3
- local HOST_NAME
+ local HOSTNAME
- HOST_NAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
mm_mythdb_set "UPDATE keybindings SET keylist=\"${KEYLIST}\" \
- WHERE hostname=\"${HOST_NAME}\" AND context=\"${CONTEXT}\" AND
action=\"${ACTION}\""
+ WHERE hostname=\"${HOSTNAME}\" AND context=\"${CONTEXT}\" AND
action=\"${ACTION}\""
}
mm_mythdb_music_playlists_dump() {
@@ -1334,13 +1345,13 @@
local MUSICPLAYLIST=$1
local SCOPE=$2
- local HOST_NAME
+ local HOSTNAME
- HOST_NAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
case "${SCOPE}" in
local)
- mm_mythdb_set "UPDATE music_playlists SET
hostname=\"${HOST_NAME}\" WHERE playlist_name=\"${MUSICPLAYLIST}\""
+ mm_mythdb_set "UPDATE music_playlists SET
hostname=\"${HOSTNAME}\" WHERE playlist_name=\"${MUSICPLAYLIST}\""
;;
global)
mm_mythdb_set "UPDATE music_playlists SET
hostname=\"\" WHERE playlist_name=\"${MUSICPLAYLIST}\""
@@ -1351,28 +1362,28 @@
mm_mythdb_settings_delete() {
local VALUE=$1
- local HOST_NAME
+ local HOSTNAME
- HOST_NAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
if /usr/bin/test -n "${VALUE}" ; then
- mm_mythdb_set "DELETE FROM settings WHERE value=\"${VALUE}\" AND
hostname=\"${HOST_NAME}\""
+ mm_mythdb_set "DELETE FROM settings WHERE value=\"${VALUE}\" AND
hostname=\"${HOSTNAME}\""
else
- mm_mythdb_set "DELETE FROM settings WHERE
hostname=\"${HOST_NAME}\""
+ mm_mythdb_set "DELETE FROM settings WHERE hostname=\"${HOSTNAME}\""
fi
}
mm_mythdb_settings_dump() {
local VALUE=$1
- local HOST_NAME
+ local HOSTNAME
- HOST_NAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
if /usr/bin/test -n "${VALUE}" ; then
- mm_mythdb_get "SELECT * FROM settings WHERE value=\"${VALUE}\" AND
hostname=\"${HOST_NAME}\""
+ mm_mythdb_get "SELECT * FROM settings WHERE value=\"${VALUE}\" AND
hostname=\"${HOSTNAME}\""
else
- mm_mythdb_get "SELECT * FROM settings WHERE
hostname=\"${HOST_NAME}\""
+ mm_mythdb_get "SELECT * FROM settings WHERE
hostname=\"${HOSTNAME}\""
fi
}
@@ -1380,24 +1391,24 @@
local VALUE=$1
local DATA=$2
- local HOST_NAME
+ local HOSTNAME
- HOST_NAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
- mm_mythdb_set "UPDATE settings SET data=\"${DATA}\" WHERE
value=\"${VALUE}\" AND hostname=\"${HOST_NAME}\""
+ mm_mythdb_set "UPDATE settings SET data=\"${DATA}\" WHERE
value=\"${VALUE}\" AND hostname=\"${HOSTNAME}\""
}
mm_mythdb_settings_set() {
local VALUE=$1
local DATA=$2
- local HOST_NAME
+ local HOSTNAME
local DATA_CURRENT
- HOST_NAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
mm_mythdb_settings_delete "${VALUE}"
- mm_mythdb_set "INSERT INTO settings SET data=\"${DATA}\",
value=\"${VALUE}\", hostname=\"${HOST_NAME}\""
+ mm_mythdb_set "INSERT INTO settings SET data=\"${DATA}\",
value=\"${VALUE}\", hostname=\"${HOSTNAME}\""
}
mm_mythdb_settings_get() {
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_DHCP
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_DHCP
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_DHCP
Mon Sep 1 15:42:38 2008
@@ -11,7 +11,7 @@
# If the DCHP override file exists, then DHCP should be completely
configured.
if /usr/bin/test -e /etc/conf.d/dhcp.override ; then
- if /usr/bin/test ! -n "`/bin/hostname`" ; then
+ if /usr/bin/test ! -n "`mm_hostname`" ; then
mm_message_output err "error: 'Host Name'
(or 'MM_DHCP_HOST_NAME') not configured."
fi
if /usr/bin/test ! -e /etc/localtime ; then
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/master
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/master
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/master
Mon Sep 1 15:42:38 2008
@@ -18,7 +18,7 @@
mm_message_output info "configuring MythTV master backend
communication ..."
- HOSTNAME=`/bin/hostname`
+ HOSTNAME=`mm_hostname`
# Determine broadcast address.
MASTER_WOL_BROADCAST=`/sbin/ifconfig ${MM_NETWORK_INTERFACE} |
/bin/grep ' Bcast:' | /bin/sed 's%.* Bcast:\([^ ]*\) .*%\1%'`
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/mythtv
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/mythtv
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/mythtv
Mon Sep 1 15:42:38 2008
@@ -212,7 +212,7 @@
fi
if /usr/bin/test ${found} -eq 0 ; then
/usr/bin/logger -t minimyth -p "local0.warn" \
- "warning: certain DVDs may not play. see
<http://`/bin/hostname`/minimyth/document-faq.html#dvd>"
+ "warning: certain DVDs may not play. see
<http://`mm_hostname`/minimyth/document-faq.html#dvd>"
fi
fi
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/video
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/video
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/video
Mon Sep 1 15:42:38 2008
@@ -118,7 +118,7 @@
pref_deint0="${MM_VIDEO_DEINTERLACER}"
pref_deint1='none'
pref_filters=''
- hostname=`/bin/hostname`
+ hostname=`mm_hostname`
profilegroupid=
if /usr/bin/test -n "${hostname}" ; then
profilegroupid=`mm_mythdb_get \
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
