Check-in [8b7d78e651]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:8b7d78e6513b9d02231980f3c0c5dfcef0215e0a
Date: 2012-05-05 10:35:28
User: BarryK
Comment:small fix for network auto reconnect

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/etc/rc.d/rc.sysinit

@@ -72,10 +72,11 @@
 #120301 a problem if initrd has kernel default font, switching here changes all o/p from initrd to partial garbage.
 #120313 fix 120301 font garbage. 120331 clear requires redirection to /dev/console.
 #120409 no longer deleting /tmp/* in rc.shutdown... (note, init script in initrd.gz wipes it)
 #120423 pemasu: /dev/mouse was missing in full install.
 #120503 if kernel mounts a f.s. on /dev, removes my skeleton /dev
+#120505 remove network reconnect flag if it exists.
 
 #unset TZ #100319 busybox hwclock gives priority to this (rather than /etc/localtime) and 'init' has set it wrong.
 #...comment-out for now. note, TZ now set in rc.country.
 ORIGLANG="`grep '^LANG=' /etc/profile | cut -f 2 -d '=' | cut -f 1 -d ' '`" #120217
 ORIGLANG1="${ORIGLANG%_*}" #ex: en
@@ -649,10 +650,13 @@
  echo "$UPDATE_MONTH" > /var/local/sns/current_month
  for ONECOUNT in sns/r sns/t pupdial/isp1/r pupdial/isp1/t pupdial/isp2/r pupdial/isp2/t;do
   echo -n 0 > /var/local/${ONECOUNT}x_bytes_month
  done
 fi
+
+#120505 remove this so that /usr/bin/xwin does not try another auto network connect (ref: /usr/sbin/hostname-set)...
+[ -f /tmp/simple_network_setup/network_default_reconnect_required_flag ] && rm -f /tmp/simple_network_setup/network_default_reconnect_required_flag
 
 #120505 ***NOTE: this code block extracted to /usr/sbin/network_default_connect. in future could delete it here and call that script.***
 #100227 choose default network tool...
 DEFAULTCONNECT="`cat /usr/local/bin/defaultconnect | tail -n 1 | tr -s " " | cut -f 2 -d " "`"
 [ "`grep 'gprs' /usr/local/bin/defaultconnect`" != "" ] && DEFAULTCONNECT='pgprs-connect'