diff options
| author | Sascha Silbe <silbe@activitycentral.com> | 2011-07-25 19:36:42 (GMT) |
|---|---|---|
| committer | Sascha Silbe <silbe@activitycentral.com> | 2011-07-25 19:36:42 (GMT) |
| commit | 6177dac5c8309c8e3f92a0d208cdf011c4726281 (patch) | |
| tree | a212053a8c461d4892caba5552b1f6c461ef6179 | |
| parent | 4048172db578afcb37655e1e7e0755d9d8bb5024 (diff) | |
| parent | c4907433575dda25f9fe5647b013362afb1dab8b (diff) | |
Merge remote-tracking branch 'remotes/olpc/v3.0' into dextrose-3
* remotes/olpc/v3.0:
v3.0.0 release
base: don't recreate /etc/sysconfig/network (#11060)
| -rw-r--r-- | examples/olpc-os-11.2.0-xo1.5.ini | 1 | ||||
| -rw-r--r-- | examples/olpc-os-11.2.0-xo1.ini | 1 | ||||
| -rw-r--r-- | modules/base/kspost.10.core.inc | 4 | ||||
| -rwxr-xr-x | osbuilder.py | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/examples/olpc-os-11.2.0-xo1.5.ini b/examples/olpc-os-11.2.0-xo1.5.ini index 6783212..ee8e7d3 100644 --- a/examples/olpc-os-11.2.0-xo1.5.ini +++ b/examples/olpc-os-11.2.0-xo1.5.ini @@ -1,4 +1,5 @@ [global] +suggested_oob_version=3.0 fedora_release=14 olpc_version_major=11 olpc_version_minor=2 diff --git a/examples/olpc-os-11.2.0-xo1.ini b/examples/olpc-os-11.2.0-xo1.ini index 16b331f..8bb05c1 100644 --- a/examples/olpc-os-11.2.0-xo1.ini +++ b/examples/olpc-os-11.2.0-xo1.ini @@ -1,4 +1,5 @@ [global] +suggested_oob_version=3.0 fedora_release=14 olpc_version_major=11 olpc_version_minor=2 diff --git a/modules/base/kspost.10.core.inc b/modules/base/kspost.10.core.inc index 37157d2..5881566 100644 --- a/modules/base/kspost.10.core.inc +++ b/modules/base/kspost.10.core.inc @@ -95,10 +95,6 @@ post-stop script end script EOF -# prevent NM from setting the hostname and modifying /etc/hosts to reflect this -# this allows olpc-configure to set a hostname based on the MAC address -echo "NM_IGNORE_HOSTNAME_LOCALHOST=yes" >> /etc/sysconfig/network - # OLPC CA certificate (#9624) # this is used by wget, but the Web activity uses cert8.db in its own # installation (which is then copied into user's profile dir) diff --git a/osbuilder.py b/osbuilder.py index d00ba05..1baea61 100755 --- a/osbuilder.py +++ b/osbuilder.py @@ -18,7 +18,7 @@ # # canonical source of version number -VERSION="3.0.0_pre2" +VERSION="3.0.0" # "make install" modifies this in the installed copy INSTALLED=0 |