wok-next annotate get-softmodem-driver/stuff/hsfmodem-7.80.02.03full-cnxtconfig.diff @ rev 3452

get-softmodem-driver: fix to hsf auto config
author Dominique Corbex <domcox@users.sourceforge.net>
date Mon Jun 15 09:08:48 2009 +0200 (2009-06-15)
parents
children
rev   line source
domcox@3452 1 --- hsfmodem-7.80.02.03full/scripts/cnxtconfig.in Fri Feb 20 22:30:17 2009
domcox@3452 2 +++ hsfmodem-7.80.02.03full-slitaz/scripts/cnxtconfig.in Fri Jun 12 16:20:59 2009
domcox@3452 3 @@ -74,7 +74,7 @@
domcox@3452 4 answer="${region}"
domcox@3452 5 ;;
domcox@3452 6 *)
domcox@3452 7 - answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`"
domcox@3452 8 + answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
domcox@3452 9 ;;
domcox@3452 10 esac
domcox@3452 11 fi
domcox@3452 12 @@ -109,15 +109,25 @@
domcox@3452 13 {
domcox@3452 14 # Try to guess what region we're in, using the timezone settings
domcox@3452 15
domcox@3452 16 - localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
domcox@3452 17 +# localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
domcox@3452 18 +#
domcox@3452 19 +# if ! [ ${localtime_size} -gt 0 ]; then
domcox@3452 20 +# return 1
domcox@3452 21 +# fi
domcox@3452 22
domcox@3452 23 - if ! [ ${localtime_size} -gt 0 ]; then
domcox@3452 24 +# zoneinfo_dir=/usr/share/zoneinfo
domcox@3452 25 +#
domcox@3452 26 +# if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
domcox@3452 27 +# return 1
domcox@3452 28 +#
domcox@3452 29 +# fi
domcox@3452 30 + if [ ! -e /etc/TZ ]; then
domcox@3452 31 return 1
domcox@3452 32 fi
domcox@3452 33
domcox@3452 34 - zoneinfo_dir=/usr/share/zoneinfo
domcox@3452 35 + zoneinfo_dir=/usr/share/softmodem
domcox@3452 36
domcox@3452 37 - if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
domcox@3452 38 + if [ ! -f ${zoneinfo_dir}/hsfzone.tab ]; then
domcox@3452 39 return 1
domcox@3452 40 fi
domcox@3452 41
domcox@3452 42 @@ -206,18 +216,25 @@
domcox@3452 43 iso_VN=00BC # VIETNAM
domcox@3452 44
domcox@3452 45 (
domcox@3452 46 - cd ${zoneinfo_dir} 2>/dev/null || return 1
domcox@3452 47 - find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
domcox@3452 48 - while read file; do
domcox@3452 49 - cmp -s /etc/localtime $file || continue
domcox@3452 50 +# cd ${zoneinfo_dir} 2>/dev/null || return 1
domcox@3452 51 +# find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
domcox@3452 52 +# while read file; do
domcox@3452 53 +# cmp -s /etc/localtime $file || continue
domcox@3452 54 # in the egrep and sed regular expressions below, it is very important to
domcox@3452 55 # have tabs, not spaces
domcox@3452 56 - egrep " $file( .*|\$)" ${zoneinfo_dir}/zone.tab
domcox@3452 57 - done | sed -n '/^[^#]/s/ .*//p' | sort | uniq | \
domcox@3452 58 - while read code; do
domcox@3452 59 - eval "echo \${iso_${code}}"
domcox@3452 60 - done | sort | uniq
domcox@3452 61 - return 0
domcox@3452 62 +# egrep " $file( .*|\$)" ${zoneinfo_dir}/zone.tab
domcox@3452 63 +# done | sed -n '/^[^#]/s/ .*//p' | sort | uniq | \
domcox@3452 64 +# while read code; do
domcox@3452 65 +# eval "echo \${iso_${code}}"
domcox@3452 66 +# done | sort | uniq
domcox@3452 67 +# return 0
domcox@3452 68 + zone=`cat /etc/TZ`
domcox@3452 69 + egrep $zone ${zoneinfo_dir}/zone.tab | sed -n '/^[^#]/s/ .*//p' | sort | uniq | \
domcox@3452 70 + while read code; do
domcox@3452 71 + eval "echo \${iso_${code}}"
domcox@3452 72 + done | sort | uniq
domcox@3452 73 + return 0
domcox@3452 74 +
domcox@3452 75 )
domcox@3452 76 }
domcox@3452 77
domcox@3452 78 @@ -1636,7 +1653,7 @@
domcox@3452 79 update-modules
domcox@3452 80 else
domcox@3452 81 if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then
domcox@3452 82 - if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then
domcox@3452 83 + if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then
domcox@3452 84 if ! cp ${modulesconf}.$$ ${modulesconf}; then
domcox@3452 85 rm -f ${modulesconf}.$$ ${f}
domcox@3452 86 exit 1
domcox@3452 87 @@ -1662,7 +1679,7 @@
domcox@3452 88 fi
domcox@3452 89
domcox@3452 90 if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then
domcox@3452 91 - if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then
domcox@3452 92 + if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then
domcox@3452 93 if ! cp ${modprobeconf}.$$ ${modprobeconf}; then
domcox@3452 94 rm -f ${modprobeconf}.$$ ${f}
domcox@3452 95 exit 1
domcox@3452 96 @@ -1710,7 +1727,7 @@
domcox@3452 97 fi
domcox@3452 98
domcox@3452 99 if [ -h /dev/modem ] && /bin/ls -l /dev/modem 2>/dev/null | ${AWK} '{print $11}' | egrep -q '(ttyS|cua)@CNXTSERDEV@[0-9][0-9]*'; then
domcox@3452 100 - rm -f /dev/modem
domcox@3452 101 + echo
domcox@3452 102 fi
domcox@3452 103
domcox@3452 104 rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
domcox@3452 105 @@ -1734,7 +1751,7 @@
domcox@3452 106 fi
domcox@3452 107
domcox@3452 108 echo "alias /dev/ttyS@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@"
domcox@3452 109 - echo "alias /dev/modem /dev/ttyS@CNXTSERDEV@"
domcox@3452 110 + echo "alias /dev/modem none"
domcox@3452 111 echo "alias char-major-${cnxttty_major} /dev/ttyS@CNXTSERDEV@"
domcox@3452 112 if [ "$1" = modulesconf ]; then
domcox@3452 113 echo "alias /dev/cua@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@"
domcox@3452 114 @@ -1908,7 +1925,7 @@
domcox@3452 115 REGISTER ^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL symlink $devname modem
domcox@3452 116 UNREGISTER ^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL unlink modem' \
domcox@3452 117 > /etc/devfs/conf.d/@CNXTTARGET@.conf
domcox@3452 118 - rm -f /dev/modem
domcox@3452 119 + echo
domcox@3452 120 which update-devfsd >/dev/null 2>&1 && update-devfsd
domcox@3452 121 killall -HUP devfsd 2>/dev/null
domcox@3452 122 else
domcox@3452 123 @@ -1922,7 +1939,7 @@
domcox@3452 124 cp /etc/devfsd.conf.$$ /etc/devfsd.conf
domcox@3452 125 fi
domcox@3452 126 rm -f /etc/devfsd.conf.$$
domcox@3452 127 - rm -f /dev/modem
domcox@3452 128 + echo
domcox@3452 129 killall -HUP devfsd 2>/dev/null
domcox@3452 130 fi
domcox@3452 131 fi
domcox@3452 132 @@ -1971,13 +1988,13 @@
domcox@3452 133 done
domcox@3452 134
domcox@3452 135 if [ -h /dev/modem ] && /bin/ls -l /dev/modem 2>/dev/null | ${AWK} '{print $11}' | egrep -q '(ttyS|cua)@CNXTSERDEV@[0-9][0-9]*'; then
domcox@3452 136 - rm -f /dev/modem
domcox@3452 137 + echo
domcox@3452 138 fi
domcox@3452 139
domcox@3452 140 if [ -e /dev/modem ]; then
domcox@3452 141 if ! fuser /dev/modem >/dev/null 2>&1; then
domcox@3452 142 - rm -f /dev/modem.old
domcox@3452 143 - mv /dev/modem /dev/modem.old
domcox@3452 144 + echo
domcox@3452 145 + echo
domcox@3452 146
domcox@3452 147 echo "WARNING: renamed existing /dev/modem to /dev/modem.old:"
domcox@3452 148 echo ""
domcox@3452 149 @@ -1986,7 +2003,7 @@
domcox@3452 150 fi
domcox@3452 151
domcox@3452 152 if [ ! -e /dev/modem ]; then
domcox@3452 153 - ln -sf /dev/ttyS@CNXTSERDEV@0 /dev/modem
domcox@3452 154 + echo
domcox@3452 155 fi
domcox@3452 156 fi
domcox@3452 157 fi
domcox@3452 158 @@ -2195,6 +2212,10 @@
domcox@3452 159 elif [ -d /var/lib/LST ]; then
domcox@3452 160 OSDISTNAME=Caldera
domcox@3452 161 OSDISTIDNT=caldera
domcox@3452 162 + elif [ -f /etc/slitaz-release ]; then
domcox@3452 163 + OSDISTNAME=SliTaz
domcox@3452 164 + OSDISTIDNT=slitaz
domcox@3452 165 + OSDISTVERS="`cat /etc/slitaz-release`"
domcox@3452 166 fi
domcox@3452 167
domcox@3452 168 OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`"
domcox@3452 169 @@ -2249,7 +2270,7 @@
domcox@3452 170
domcox@3452 171 dump_file()
domcox@3452 172 {
domcox@3452 173 - dump_cmd cat -v $@
domcox@3452 174 + dump_cmd cat $@
domcox@3452 175 }
domcox@3452 176
domcox@3452 177 dump_diagnostics()
domcox@3452 178 @@ -2568,7 +2589,7 @@
domcox@3452 179 fi
domcox@3452 180 units="${specificunit}"
domcox@3452 181 if [ -z "${units}" ]; then
domcox@3452 182 - units=`ls --ignore=flush_nvm ${procdrvdir}`
domcox@3452 183 + units=`ls ${procdrvdir} | grep -v flush_nvm`
domcox@3452 184
domcox@3452 185 if [ -z "${units}" ]; then
domcox@3452 186 echo ""
domcox@3452 187 @@ -2865,7 +2886,7 @@
domcox@3452 188 explicitopt=true
domcox@3452 189 do_cfgregion=true
domcox@3452 190 if [ -n "$2" ]; then
domcox@3452 191 - setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`"
domcox@3452 192 + setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
domcox@3452 193 fi
domcox@3452 194 shift 2
domcox@3452 195 ;;
domcox@3452 196 @@ -2935,7 +2956,7 @@
domcox@3452 197
domcox@3452 198 # Accept --region <name> as equivalent to --region=<name>
domcox@3452 199 if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then
domcox@3452 200 - setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`"
domcox@3452 201 + setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/s'`"
domcox@3452 202 shift
domcox@3452 203 fi
domcox@3452 204
domcox@3452 205