diff options
Diffstat (limited to 'abs/core-testing/LinHES-config/systemconfig.sh')
| -rwxr-xr-x | abs/core-testing/LinHES-config/systemconfig.sh | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh index d84c0dc..6c72b92 100755 --- a/abs/core-testing/LinHES-config/systemconfig.sh +++ b/abs/core-testing/LinHES-config/systemconfig.sh @@ -191,7 +191,7 @@ function setupremote { do cat $i >> ${BASE}/etc/lircd.conf done - cp lircrc ${BASE}/etc/lircrc + cp -f lircrc* $BASE/etc/lircrc 2> /dev/null if [ -f $TEMPLATES/LCD/$LCDtype/lircrc ] then cat $TEMPLATES/LCD/$LCDtype/lircrc >> /etc/lircrc @@ -358,10 +358,10 @@ EOF #this is used for backend or standlone types if [ $1 = "1" ] then - echo "server ntp1.cs.wisc.edu" >> ${BASE}/etc/ntp.conf - echo "server ntp3.sf-bay.org" >> ${BASE}/etc/ntp.conf - echo "restrict ntp1.cs.wisc.edu noquery nomodify" >> ${BASE}/etc/ntp.conf - echo "restrict ntp3.sf-bay.org noquery nomodify" >> ${BASE}/etc/ntp.conf + echo "server pool.ntp.org" >> ${BASE}/etc/ntp.conf + #echo "server ntp3.sf-bay.org" >> ${BASE}/etc/ntp.conf + echo "restrict pool.ntp.org" >> ${BASE}/etc/ntp.conf + #echo "restrict ntp3.sf-bay.org noquery nomodify" >> ${BASE}/etc/ntp.conf else echo "server $dbhost" >> ${BASE}/etc/ntp.conf @@ -659,29 +659,29 @@ then fi #Setting the default, just to avoid the or statement.. -if [ x$UseHobbit = x ] -then - UseHobbit=0 -fi - -if [ x$UseHobbit = x1 ] -then - case $SystemType in - Standalone|Master_backend ) - ser_daemon_add="hobbit $ser_daemon_add" - ser_install="hobbitserver $ser_install" - ;; - - *) ser_daemon_add="hobbit-client $ser_daemon_add" - ser_install="hobbit-client $ser_install" - ;; - esac -else - ser_daemon_remove="hobbit hobbit-client $ser_daemon_remove" - ser_remove="hobbit-client hobbitserver $ser_remove" - rm -f /data/srv/httpd/htdocs/hobbit/index.html - - fi +#if [ x$UseHobbit = x ] +#then +# UseHobbit=0 +#fi + +#if [ x$UseHobbit = x1 ] +#then +# case $SystemType in +# Standalone|Master_backend ) +# ser_daemon_add="hobbit $ser_daemon_add" +# ser_install="hobbitserver $ser_install" +# ;; +# +# *) ser_daemon_add="hobbit-client $ser_daemon_add" +# ser_install="hobbit-client $ser_install" +# ;; +# esac +#else +# ser_daemon_remove="hobbit hobbit-client $ser_daemon_remove" +# ser_remove="hobbit-client hobbitserver $ser_remove" +# rm -f /data/srv/httpd/htdocs/hobbit/index.html +# +# fi |