lkml.org 
[lkml]   [2006]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 7/9] namespaces: utsname: sysctl hack
    Sysctl uts patch.  This clearly will need to be done another way, but
    since sysctl itself needs to be container aware, 'the right thing' is
    a separate patchset.

    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>

    ---

    kernel/sysctl.c | 20 ++++++++++----------
    1 files changed, 10 insertions(+), 10 deletions(-)

    e03808f9c1b803ff67e396e806c062c97b4073aa
    diff --git a/kernel/sysctl.c b/kernel/sysctl.c
    index e82726f..ab36b41 100644
    --- a/kernel/sysctl.c
    +++ b/kernel/sysctl.c
    @@ -233,8 +233,8 @@ static ctl_table kern_table[] = {
    {
    .ctl_name = KERN_OSTYPE,
    .procname = "ostype",
    - .data = system_utsname.sysname,
    - .maxlen = sizeof(system_utsname.sysname),
    + .data = init_uts_ns.name.sysname,
    + .maxlen = sizeof(init_uts_ns.name.sysname),
    .mode = 0444,
    .proc_handler = &proc_doutsstring,
    .strategy = &sysctl_string,
    @@ -242,8 +242,8 @@ static ctl_table kern_table[] = {
    {
    .ctl_name = KERN_OSRELEASE,
    .procname = "osrelease",
    - .data = system_utsname.release,
    - .maxlen = sizeof(system_utsname.release),
    + .data = init_uts_ns.name.release,
    + .maxlen = sizeof(init_uts_ns.name.release),
    .mode = 0444,
    .proc_handler = &proc_doutsstring,
    .strategy = &sysctl_string,
    @@ -251,8 +251,8 @@ static ctl_table kern_table[] = {
    {
    .ctl_name = KERN_VERSION,
    .procname = "version",
    - .data = system_utsname.version,
    - .maxlen = sizeof(system_utsname.version),
    + .data = init_uts_ns.name.version,
    + .maxlen = sizeof(init_uts_ns.name.version),
    .mode = 0444,
    .proc_handler = &proc_doutsstring,
    .strategy = &sysctl_string,
    @@ -260,8 +260,8 @@ static ctl_table kern_table[] = {
    {
    .ctl_name = KERN_NODENAME,
    .procname = "hostname",
    - .data = system_utsname.nodename,
    - .maxlen = sizeof(system_utsname.nodename),
    + .data = init_uts_ns.name.nodename,
    + .maxlen = sizeof(init_uts_ns.name.nodename),
    .mode = 0644,
    .proc_handler = &proc_doutsstring,
    .strategy = &sysctl_string,
    @@ -269,8 +269,8 @@ static ctl_table kern_table[] = {
    {
    .ctl_name = KERN_DOMAINNAME,
    .procname = "domainname",
    - .data = system_utsname.domainname,
    - .maxlen = sizeof(system_utsname.domainname),
    + .data = init_uts_ns.name.domainname,
    + .maxlen = sizeof(init_uts_ns.name.domainname),
    .mode = 0644,
    .proc_handler = &proc_doutsstring,
    .strategy = &sysctl_string,
    --
    1.1.6
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-05-18 17:54    [W:0.028 / U:0.576 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site