diff options
| author | Santiago Collazo <scollazo@activitycentral.com> | 2012-11-01 23:44:22 (GMT) |
|---|---|---|
| committer | Santiago Collazo <scollazo@activitycentral.com> | 2012-11-01 23:44:22 (GMT) |
| commit | 8b8a2c3c08233aaf02a699d28957d456a842fd15 (patch) | |
| tree | 834b8da127fab562d5d6e38468d076a79ee26ee5 | |
| parent | fbf61d7db7325217163773ed86612e2dc290b93e (diff) | |
| parent | 04609594f308d971d6a093dc6d9a9e300efe7b35 (diff) | |
Merge branch 'olpc_master_2' into integration-4.1
| -rw-r--r-- | modules/base/kspkglist.10.core.inc | 1 | ||||
| -rw-r--r-- | modules/base/kspost.10.core.inc | 18 |
2 files changed, 3 insertions, 16 deletions
diff --git a/modules/base/kspkglist.10.core.inc b/modules/base/kspkglist.10.core.inc index a208eb8..ee25e3c 100644 --- a/modules/base/kspkglist.10.core.inc +++ b/modules/base/kspkglist.10.core.inc @@ -17,6 +17,7 @@ yum tree nano less +rsyslog # basic debugging strace diff --git a/modules/base/kspost.10.core.inc b/modules/base/kspost.10.core.inc index 6a26c7a..70ea493 100644 --- a/modules/base/kspost.10.core.inc +++ b/modules/base/kspost.10.core.inc @@ -35,21 +35,8 @@ sed -i -e '1,6s/^#auth/auth/' /etc/pam.d/su # solution: don't ship this file in the image, then it won't get checked rm -f /etc/sysconfig/keyboard -# A similarly sticky situation is encountered with /etc/sysconfig/network -# We must program our hostname in this file to keep NetworkManager happy -# (#10852), but modifying this file which is ordinarily shipped with the image -# would break pristine-ness. We cannot put this file in statetab for storage -# in the persistent overlay, because /etc/rc.d/rc.sysinit reads this file in -# early boot, before statetab mounts have been put in place (#11060). -# So we resort to removing the file from the image and writing it in -# olpc-configure on first boot. -rm -f /etc/sysconfig/network - -cat >/etc/sysconfig/i18n <<__EOF__ -# LANG=C considerably speeds up boot (measured 5sec) -- bernie -LANG=C -SYSFONT=sun12x22 -__EOF__ +# Considerably speeds up boot (measured 5sec) -- bernie +echo "LANG=C" > /etc/locale.conf # OLPC custom VT layout and serial console setup (#9517, #10354) sed -i -e 's:/sbin/agetty.*:/sbin/agetty --login-pause --autologin root --noclear %I:' \ @@ -84,7 +71,6 @@ sed -i -e 's/RW_OPTIONS=/RW_OPTIONS="-o size=1M -o nr_inodes=1024"/' /etc/syscon # over upgrades. cat >/etc/statetab.d/olpc <<EOF /etc/ssh -/etc/sysconfig/i18n /etc/hosts /etc/timezone /var/lib/dbus |