Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Collazo <scollazo@activitycentral.com>2012-10-29 18:24:47 (GMT)
committer Santiago Collazo <scollazo@activitycentral.com>2012-10-29 18:24:47 (GMT)
commite66485aae80b950cc3e357b11022c9674d65a74e (patch)
tree7c041448810ee8047003d585e52709a36e32c734
parent7e177eab206867356e19a4d16e048bdf91148cc8 (diff)
Merged bleeding-edge and oob 4.1
-rw-r--r--modules/base/kspost.11.core.inc3
-rw-r--r--modules/base/kspost.12.core.inc4
-rw-r--r--modules/base/kspost.13.core.inc6
-rw-r--r--modules/base/kspost.14.core.inc59
4 files changed, 72 insertions, 0 deletions
diff --git a/modules/base/kspost.11.core.inc b/modules/base/kspost.11.core.inc
new file mode 100644
index 0000000..f806a4a
--- /dev/null
+++ b/modules/base/kspost.11.core.inc
@@ -0,0 +1,3 @@
+# Disable "requiretty" for "wheel" group, so that "sudo" commands are be able to run in a terminal-less environment.
+echo "Defaults:%wheel !requiretty" >> /etc/sudoers
+
diff --git a/modules/base/kspost.12.core.inc b/modules/base/kspost.12.core.inc
new file mode 100644
index 0000000..7b94284
--- /dev/null
+++ b/modules/base/kspost.12.core.inc
@@ -0,0 +1,4 @@
+# sl#3267, enable ctrl+alt+erase to restart sugar for all xo-[1,1.5,1.75] laptops
+sed -i -e '/DontZap/d' /usr/share/olpc-utils/xorg.conf.d/xo1.conf
+sed -i -e '/DontZap/d' /usr/share/olpc-utils/xorg.conf.d/xo1.5.conf
+sed -i -e '/DontZap/d' /usr/share/olpc-utils/xorg.conf.d/xo1.75.conf
diff --git a/modules/base/kspost.13.core.inc b/modules/base/kspost.13.core.inc
new file mode 100644
index 0000000..54d74fc
--- /dev/null
+++ b/modules/base/kspost.13.core.inc
@@ -0,0 +1,6 @@
+# Set microphone recording level
+# don't think this is the right place JV
+# might need to patch olpc-configure
+echo "/usr/bin/amixer set \"Master Surround\" 31 unmute" > /etc/rc.d/rc.local
+echo "/usr/bin/alsactl store" >> /etc/rc.d/rc.local
+
diff --git a/modules/base/kspost.14.core.inc b/modules/base/kspost.14.core.inc
new file mode 100644
index 0000000..8dbbe60
--- /dev/null
+++ b/modules/base/kspost.14.core.inc
@@ -0,0 +1,59 @@
+cat << EOF > /usr/bin/yumfix
+#!/usr/bin/env python
+# Copyright (C) 2011, OLPC-AU.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+import os
+import sys
+import string
+import gettext
+import gconf
+
+def main():
+
+
+ ## JV export http_proxy from .gconf
+ yumtmp = open("/tmp/yum.conf.mod", "w")
+ if not os.path.exists('/home/olpc/.gconf/system/proxy'):
+ yumtmp.close()
+ sys.exit(1)
+ sys_dir = '/system/http_proxy'
+ client = gconf.client_get_default()
+ use_proxy = client.get_string('/system/proxy/mode')
+ if use_proxy != 'none':
+ http_host = client.get_string('%s/host' % sys_dir)
+ http_port = client.get_int('%s/port' % sys_dir)
+ proxy_info = '%s:%d' % (http_host, http_port)
+ yumtmp.write('proxy=http://%s\n' % proxy_info)
+ use_auth = client.get_bool('%s/use_authentication' % sys_dir)
+ if use_auth is True:
+ auth_user = client.get_string('%s/authentication_user' % sys_dir)
+ yumtmp.write('proxy_username %s\n' % auth_user)
+ auth_pass = client.get_string('%s/authentication_password' % sys_dir)
+ yumtmp.write('proxy_password %s\n' % auth_pass)
+ else:
+ pass
+ yumtmp.close()
+
+main()
+
+EOF
+chmod 755 /usr/bin/yumfix
+
+# run the above from ~/.xsession
+echo "/usr/bin/yumfix" > /home/olpc/.xsession
+
+echo "include=/tmp/yum.conf.mod" >> /etc/yum.conf