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