Changeset 2633

Show
Ignore:
Timestamp:
03/10/08 14:29:47 (9 months ago)
Author:
pebenito
Message:

trunk: Revise upstart support in init module to use a tunable, as upstart is now used in Fedora too.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Changelog

    r2632 r2633  
     1- Revise upstart support in init module to use a tunable, as upstart is now 
     2  used in Fedora too. 
    13- Add iferror.m4 rather generate it out of the Makefiles. 
    24- Definitions for open permisson on file and similar objects from Eric 

  • trunk/policy/modules/system/init.te

    r2626 r2633  
    11 
    2 policy_module(init,1.9.1) 
     2policy_module(init,1.9.2) 
    33 
    44gen_require(` 
    …… 
    1010# Declarations 
    1111# 
     12 
     13## <desc> 
     14## <p> 
     15## Enable support for upstart as the init program. 
     16## </p> 
     17## </desc> 
     18gen_tunable(init_upstart,false) 
    1219 
    1320# used for direct running of init scripts 
    …… 
    5057domain_entry_file(initrc_t,initrc_exec_t) 
    5158role system_r types initrc_t; 
     59# should be part of the true block 
     60# of the below init_upstart tunable 
     61# but this has a typeattribute in it 
     62corecmd_shell_entry_type(initrc_t) 
    5263 
    5364type initrc_devpts_t; 
    …… 
    164175') 
    165176 
    166 ifndef(`distro_ubuntu',` 
     177tunable_policy(`init_upstart',` 
     178        corecmd_shell_domtrans(init_t,initrc_t) 
     179',` 
    167180        # Run the shell in the sysadm role for single-user mode. 
    168181        # causes problems with upstart