November 2006 - launchd-changes - lists.macosforge.org

[22962] tags/launchd-177/
by source_changes＠macosforge.org 29 Nov '06

29 Nov '06

Revision: 22962 http://trac.macosforge.org/projects/launchd/changeset/22962 Author: zarzycki(a)apple.com Date: 2006-11-29 14:10:38 -0800 (Wed, 29 Nov 2006) Log Message: ----------- "Tagging launchd-177 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-177/ Copied: tags/launchd-177 (from rev 22961, trunk)

1 0

[22961] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 29 Nov '06

29 Nov '06

Revision: 22961 http://trac.macosforge.org/projects/launchd/changeset/22961 Author: zarzycki(a)apple.com Date: 2006-11-29 14:10:25 -0800 (Wed, 29 Nov 2006) Log Message: ----------- <rdar://problem/4850614> 9A315: Logging In After Logging Out Fails Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-11-29 17:40:04 UTC (rev 22960) +++ trunk/launchd/src/launchd_core_logic.c 2006-11-29 22:10:25 UTC (rev 22961) @@ -592,6 +592,10 @@ job_log(j, LOG_DEBUG, "Removed"); + if (j->forced_peers_to_demand_mode) { + job_set_global_on_demand(j, false); + } + if (j->p && !j->anonymous) { if (kevent_mod(j->p, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, &kqsimple_zombie_reaper) == -1) { job_reap(j);

1 0

[22960] trunk/launchd/src
by source_changes＠macosforge.org 29 Nov '06

29 Nov '06

Revision: 22960 http://trac.macosforge.org/projects/launchd/changeset/22960 Author: zarzycki(a)apple.com Date: 2006-11-29 09:40:04 -0800 (Wed, 29 Nov 2006) Log Message: ----------- One less global. Modified Paths: -------------- trunk/launchd/src/launchd.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_core_logic.h trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2006-11-29 00:04:29 UTC (rev 22959) +++ trunk/launchd/src/launchd.c 2006-11-29 17:40:04 UTC (rev 22960) @@ -659,7 +659,7 @@ void launchd_post_kevent(void) { - if (shutdown_in_progress && total_children == 0) { + if (shutdown_in_progress && jobmgr_is_idle(root_jobmgr)) { shutdown_in_progress = false; if (getpid() != 1) { Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-11-29 00:04:29 UTC (rev 22959) +++ trunk/launchd/src/launchd_core_logic.c 2006-11-29 17:40:04 UTC (rev 22960) @@ -339,7 +339,6 @@ static char **mach_cmd2argv(const char *string); jobmgr_t root_jobmgr; jobmgr_t gc_this_jobmgr; -size_t total_children; void simple_zombie_reaper(void *obj __attribute__((unused)), struct kevent *kev) @@ -598,7 +597,6 @@ job_reap(j); } else { /* we've attached the simple zombie reaper, we're going to delete the job before it is dead */ - total_children--; job_stop(j); } } @@ -1619,7 +1617,6 @@ } } - total_children--; j->last_exit_status = status; j->p = 0; } @@ -1807,7 +1804,6 @@ break; default: j->p = c; - total_children++; job_assumes(j, close(execspair[1]) == 0); j->execfd = _fd(execspair[0]); if (sipc) { @@ -3000,6 +2996,20 @@ } } +bool +jobmgr_is_idle(jobmgr_t jm) +{ + job_t ji; + + SLIST_FOREACH(ji, &jm->jobs, sle) { + if (ji->p) { + return false; + } + } + + return true; +} + char * jobmgr_get_stdout(jobmgr_t jm) { Modified: trunk/launchd/src/launchd_core_logic.h =================================================================== --- trunk/launchd/src/launchd_core_logic.h 2006-11-29 00:04:29 UTC (rev 22959) +++ trunk/launchd/src/launchd_core_logic.h 2006-11-29 17:40:04 UTC (rev 22960) @@ -28,8 +28,8 @@ extern jobmgr_t root_jobmgr; extern jobmgr_t gc_this_jobmgr; -extern size_t total_children; +bool jobmgr_is_idle(jobmgr_t jm); void jobmgr_remove_all_inactive(jobmgr_t jm); void jobmgr_dispatch_all_other_semaphores(jobmgr_t jm, job_t nj); job_t jobmgr_find(jobmgr_t jm, const char *label); Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2006-11-29 00:04:29 UTC (rev 22959) +++ trunk/launchd/src/launchd_runtime.c 2006-11-29 17:40:04 UTC (rev 22960) @@ -74,6 +74,7 @@ static void async_callback(void); static kq_callback kqasync_callback = (kq_callback)async_callback; +static void record_caller_creds(mach_msg_header_t *mh); static void launchd_runtime2(mach_msg_size_t msg_size, mig_reply_error_t *bufRequest, mig_reply_error_t *bufReply); static mach_msg_size_t max_msg_size; static mig_callback *mig_cb_table; @@ -477,7 +478,7 @@ return KERN_SUCCESS; } -static void +void record_caller_creds(mach_msg_header_t *mh) { mach_msg_max_trailer_t *tp;

1 0

[22959] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 29 Nov '06

29 Nov '06

Revision: 22959 http://trac.macosforge.org/projects/launchd/changeset/22959 Author: zarzycki(a)apple.com Date: 2006-11-28 16:04:29 -0800 (Tue, 28 Nov 2006) Log Message: ----------- Part one of a series of patches to move launchd globals to the jobmgr_t object. Yes, the 'jobmgr_s.jm_stdout' and 'jobmgr_s.jm_stderr' elements are not fully implemented yet. The part that is missing is the setter API, but since the keys are optional, the lack of the setter isn't fatal. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-11-17 23:08:31 UTC (rev 22958) +++ trunk/launchd/src/launchd_core_logic.c 2006-11-29 00:04:29 UTC (rev 22959) @@ -197,6 +197,9 @@ mach_port_t req_port; jobmgr_t parentmgr; job_t anonj; + char *jm_stdout; + char *jm_stderr; + unsigned int global_on_demand_cnt; unsigned int transfer_bstrap:1; char name[0]; }; @@ -218,6 +221,8 @@ static void jobmgr_log(jobmgr_t jm, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); /* static void jobmgr_log_error(jobmgr_t jm, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); */ static void jobmgr_log_bug(jobmgr_t jm, const char *rcs_rev, const char *path, unsigned int line, const char *test); +static char *jobmgr_get_stdout(jobmgr_t jm); +static char *jobmgr_get_stderr(jobmgr_t jm); struct job_s { kq_callback kqjob_callback; @@ -332,7 +337,6 @@ static int dir_has_files(job_t j, const char *path); static char **mach_cmd2argv(const char *string); -static size_t global_on_demand_cnt; jobmgr_t root_jobmgr; jobmgr_t gc_this_jobmgr; size_t total_children; @@ -564,6 +568,14 @@ jobmgr_assumes(jm, launchd_mport_close_recv(jm->jm_port) == KERN_SUCCESS); } } + + if (jm->jm_stdout) { + free(jm->jm_stdout); + } + + if (jm->jm_stderr) { + free(jm->jm_stderr); + } free(jm); } @@ -707,13 +719,13 @@ } if ((j->forced_peers_to_demand_mode = val)) { - global_on_demand_cnt++; + j->mgr->global_on_demand_cnt++; } else { - global_on_demand_cnt--; + j->mgr->global_on_demand_cnt--; } - if (global_on_demand_cnt == 0) { - jobmgr_dispatch_all(root_jobmgr); + if (j->mgr->global_on_demand_cnt == 0) { + jobmgr_dispatch_all(j->mgr); } return true; @@ -2027,8 +2039,8 @@ } job_setup_fd(j, STDIN_FILENO, j->stdinpath, O_RDONLY); - job_setup_fd(j, STDOUT_FILENO, j->stdoutpath, O_WRONLY|O_APPEND|O_CREAT); - job_setup_fd(j, STDERR_FILENO, j->stderrpath, O_WRONLY|O_APPEND|O_CREAT); + job_setup_fd(j, STDOUT_FILENO, j->stdoutpath ? j->stdoutpath : jobmgr_get_stdout(j->mgr), O_WRONLY|O_APPEND|O_CREAT); + job_setup_fd(j, STDERR_FILENO, j->stderrpath ? j->stderrpath : jobmgr_get_stderr(j->mgr), O_WRONLY|O_APPEND|O_CREAT); jobmgr_setup_env_from_other_jobs(j->mgr); @@ -2688,7 +2700,7 @@ bool good_exit = (WIFEXITED(j->last_exit_status) && WEXITSTATUS(j->last_exit_status) == 0); bool dispatch_others = false; - if (global_on_demand_cnt > 0) { + if (j->mgr->global_on_demand_cnt > 0) { return false; } @@ -2988,6 +3000,30 @@ } } +char * +jobmgr_get_stdout(jobmgr_t jm) +{ + if (jm->jm_stdout) { + return jm->jm_stdout; + } else if (jm->parentmgr == NULL) { + return NULL; + } + + return jobmgr_get_stdout(jm->parentmgr); +} + +char * +jobmgr_get_stderr(jobmgr_t jm) +{ + if (jm->jm_stderr) { + return jm->jm_stderr; + } else if (jm->parentmgr == NULL) { + return NULL; + } + + return jobmgr_get_stderr(jm->parentmgr); +} + jobmgr_t jobmgr_parent(jobmgr_t jm) {

1 0

[22958] tags/launchd-176/
by source_changes＠macosforge.org 17 Nov '06

17 Nov '06

Revision: 22958 http://trac.macosforge.org/projects/launchd/changeset/22958 Author: zarzycki(a)apple.com Date: 2006-11-17 15:08:31 -0800 (Fri, 17 Nov 2006) Log Message: ----------- "Tagging launchd-176 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-176/ Copied: tags/launchd-176 (from rev 22957, trunk)

1 0

[22957] trunk/launchd/src
by source_changes＠macosforge.org 17 Nov '06

17 Nov '06

Revision: 22957 http://trac.macosforge.org/projects/launchd/changeset/22957 Author: zarzycki(a)apple.com Date: 2006-11-17 15:08:14 -0800 (Fri, 17 Nov 2006) Log Message: ----------- <rdar://problem/4537339> BootRoot: launchd needs to call kextd early if is_bootrooted() Modified Paths: -------------- trunk/launchd/src/launchctl.c trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2006-11-16 22:49:29 UTC (rev 22956) +++ trunk/launchd/src/launchctl.c 2006-11-17 23:08:14 UTC (rev 22957) @@ -64,6 +64,7 @@ #include "libbootstrap_public.h" #include "libvproc_public.h" +#include "libvproc_private.h" #include "libvproc_internal.h" #include "liblaunch_public.h" #include "liblaunch_private.h" @@ -1218,8 +1219,6 @@ do_potential_fsck(); } - do_bootroot_magic(); - if (path_check("/var/account/acct")) { assumes(acct("/var/account/acct") != -1); } @@ -1256,6 +1255,8 @@ preheat_page_cache_hack(); + _vproc_set_global_on_demand(true); + char *load_launchd_items[] = { "load", "-D", "all", "/etc/mach_init.d", NULL }; if (is_safeboot()) load_launchd_items[2] = "system"; @@ -1264,6 +1265,10 @@ const char *bcc_tag_tool[] = { "BootCacheControl", "tag", NULL }; assumes(fwexec(bcc_tag_tool, true) != -1); + do_bootroot_magic(); + + _vproc_set_global_on_demand(false); + const char *SystemStarter_tool[] = { "SystemStarter", NULL }; assumes(fwexec(SystemStarter_tool, false) != -1); Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-11-16 22:49:29 UTC (rev 22956) +++ trunk/launchd/src/launchd_core_logic.c 2006-11-17 23:08:14 UTC (rev 22957) @@ -376,7 +376,7 @@ struct machservice *ms; struct watchpath *wp; - if (!job_assumes(j, j->currently_ignored)) { + if (!j->currently_ignored) { return; } @@ -1642,7 +1642,7 @@ return; } else if (job_useless(j)) { job_remove(j); - } else if (global_on_demand_cnt == 0 && (kickstart || job_keepalive(j))) { + } else if (kickstart || job_keepalive(j)) { job_start(j); } else { job_watch(j); @@ -2688,6 +2688,10 @@ bool good_exit = (WIFEXITED(j->last_exit_status) && WEXITSTATUS(j->last_exit_status) == 0); bool dispatch_others = false; + if (global_on_demand_cnt > 0) { + return false; + } + if (j->runatload && j->start_time == 0) { job_log(j, LOG_DEBUG, "KeepAlive check: job needs to run at least once."); return true;

1 0

[22956] trunk/launchd/src
by source_changes＠macosforge.org 16 Nov '06

16 Nov '06

Revision: 22956 http://trac.macosforge.org/projects/launchd/changeset/22956 Author: zarzycki(a)apple.com Date: 2006-11-16 14:49:29 -0800 (Thu, 16 Nov 2006) Log Message: ----------- More dead code deletion and a few slight refinement to bootstrap logic. Modified Paths: -------------- trunk/launchd/src/launchd.c trunk/launchd/src/launchd.h trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2006-11-16 22:14:13 UTC (rev 22955) +++ trunk/launchd/src/launchd.c 2006-11-16 22:49:29 UTC (rev 22956) @@ -76,7 +76,6 @@ #define PID1LAUNCHD_CONF "/etc/launchd.conf" #define LAUNCHD_CONF ".launchd.conf" -#define LAUNCHCTL_PATH "/bin/launchctl" #define SECURITY_LIB "/System/Library/Frameworks/Security.framework/Versions/A/Security" extern char **environ; @@ -106,6 +105,7 @@ static job_t rlcj = NULL; static jmp_buf doom_doom_doom; static void *crash_addr; +static const char *launchctl_bootstrap_tool[] = { "/bin/launchctl", "bootstrap", NULL }; sigset_t blocked_signals = 0; bool shutdown_in_progress = false; @@ -250,7 +250,7 @@ snprintf(ldconf, sizeof(ldconf), "%s/%s", h, LAUNCHD_CONF); } - rlcj = job_new(root_jobmgr, READCONF_LABEL, LAUNCHCTL_PATH, NULL, ldconf); + rlcj = job_new(root_jobmgr, READCONF_LABEL, NULL, launchctl_bootstrap_tool, ldconf); launchd_assert(rlcj != NULL); if (argv[0]) { @@ -656,31 +656,6 @@ syslog(LOG_NOTICE, "Bug: %s:%u (%s):%u: %s", file, line, buf, saved_errno, test); } -bool -progeny_check(pid_t p) -{ - pid_t selfpid = getpid(); - - while (p != selfpid && p != 1) { - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, p }; - size_t miblen = sizeof(mib) / sizeof(mib[0]); - struct kinfo_proc kp; - size_t kplen = sizeof(kp); - - if (launchd_assumes(sysctl(mib, miblen, &kp, &kplen, NULL, 0) != -1) && launchd_assumes(kplen == sizeof(kp))) { - p = kp.kp_eproc.e_ppid; - } else { - return false; - } - } - - if (p == selfpid) { - return true; - } - - return false; -} - void launchd_post_kevent(void) { Modified: trunk/launchd/src/launchd.h =================================================================== --- trunk/launchd/src/launchd.h 2006-11-16 22:14:13 UTC (rev 22955) +++ trunk/launchd/src/launchd.h 2006-11-16 22:49:29 UTC (rev 22956) @@ -63,6 +63,4 @@ int _fd(int fd); -bool progeny_check(pid_t p); - #endif Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-11-16 22:14:13 UTC (rev 22955) +++ trunk/launchd/src/launchd_core_logic.c 2006-11-16 22:49:29 UTC (rev 22956) @@ -87,12 +87,8 @@ #define LAUNCHD_MIN_JOB_RUN_TIME 10 #define LAUNCHD_ADVISABLE_IDLE_TIMEOUT 30 -static au_asid_t inherited_asid; mach_port_t inherited_bootstrap_port; -static bool trusted_client_check(job_t j, struct ldcred *ldc); - - struct machservice { SLIST_ENTRY(machservice) sle; job_t job; @@ -3624,21 +3620,19 @@ #define LET_MERE_MORTALS_ADD_SERVERS_TO_PID1 /* XXX - This code should go away once the per session launchd is integrated with the rest of the system */ - #ifdef LET_MERE_MORTALS_ADD_SERVERS_TO_PID1 +#ifdef LET_MERE_MORTALS_ADD_SERVERS_TO_PID1 if (getpid() == 1) { - if (ldc.euid != 0 && ldc.euid != server_uid) { + if (ldc.euid && server_uid && (ldc.euid != server_uid)) { job_log(j, LOG_WARNING, "Server create: \"%s\": Will run as UID %d, not UID %d as they told us to", server_cmd, ldc.euid, server_uid); server_uid = ldc.euid; } } else #endif - if (!trusted_client_check(j, &ldc)) { - return BOOTSTRAP_NOT_PRIVILEGED; - } else if (server_uid != getuid()) { + if ((getuid() != 0) && server_uid) { job_log(j, LOG_WARNING, "Server create: \"%s\": As UID %d, we will not be able to switch to UID %d", server_cmd, getuid(), server_uid); - server_uid = getuid(); + server_uid = 0; /* zero means "do nothing" */ } js = job_new_via_mach_init(j, server_cmd, server_uid, on_demand); @@ -4340,51 +4334,11 @@ return BOOTSTRAP_SUCCESS; } -bool -trusted_client_check(job_t j, struct ldcred *ldc) -{ - static pid_t last_warned_pid = 0; - - /* - * In the long run, we wish to enforce the progeny rule, but for now, - * we'll let root and the user be forgiven. Once we get CoreProcesses - * to switch to using launchd rather than the WindowServer for indirect - * process invocation, we can then seriously look at cranking up the - * warning level here. - */ - - if (inherited_asid == ldc->asid) { - return true; - } - if (progeny_check(ldc->pid)) { - return true; - } - if (ldc->euid == geteuid()) { - return true; - } - if (ldc->euid == 0 && ldc->uid == 0) { - return true; - } - if (last_warned_pid == ldc->pid) { - return false; - } - - job_log(j, LOG_NOTICE, "Security: PID %d (ASID %d) was leaked into this session (ASID %d). This will be denied in the future.", ldc->pid, ldc->asid, inherited_asid); - - last_warned_pid = ldc->pid; - - return false; -} - void mach_init_init(mach_port_t checkin_port) { - auditinfo_t inherited_audit; job_t ji, anon_job = NULL; - getaudit(&inherited_audit); - inherited_asid = inherited_audit.ai_asid; - launchd_assert((root_jobmgr = jobmgr_new(NULL, mach_task_self(), checkin_port)) != NULL); SLIST_FOREACH(ji, &root_jobmgr->jobs, sle) {

1 0

[22955] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 16 Nov '06

16 Nov '06

Revision: 22955 http://trac.macosforge.org/projects/launchd/changeset/22955 Author: zarzycki(a)apple.com Date: 2006-11-16 14:14:13 -0800 (Thu, 16 Nov 2006) Log Message: ----------- No need to deallocate the send right. We always "make-send" in flight via MIG. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-11-16 21:33:30 UTC (rev 22954) +++ trunk/launchd/src/launchd_core_logic.c 2006-11-16 22:14:13 UTC (rev 22955) @@ -604,7 +604,6 @@ } if (j->j_port) { - job_assumes(j, launchd_mport_deallocate(j->j_port) == KERN_SUCCESS); job_assumes(j, launchd_mport_close_recv(j->j_port) == KERN_SUCCESS); }

1 0

[22954] trunk/launchd/src
by source_changes＠macosforge.org 16 Nov '06

16 Nov '06

Revision: 22954 http://trac.macosforge.org/projects/launchd/changeset/22954 Author: zarzycki(a)apple.com Date: 2006-11-16 13:33:30 -0800 (Thu, 16 Nov 2006) Log Message: ----------- Defer socket creation until requested. Modified Paths: -------------- trunk/launchd/src/launchd.c trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2006-11-16 19:17:39 UTC (rev 22953) +++ trunk/launchd/src/launchd.c 2006-11-16 21:33:30 UTC (rev 22954) @@ -485,8 +485,6 @@ pending_stderr = NULL; } } - - ipc_server_init(NULL, 0); } void Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-11-16 19:17:39 UTC (rev 22953) +++ trunk/launchd/src/launchd_core_logic.c 2006-11-16 21:33:30 UTC (rev 22954) @@ -3701,10 +3701,10 @@ return BOOTSTRAP_NO_MEMORY; } + ipc_server_init(NULL, 0); + if (!sockpath) { return BOOTSTRAP_NO_MEMORY; - } else if (getpid() == 1) { - return BOOTSTRAP_NOT_PRIVILEGED; } strncpy(spr, sockpath, sizeof(name_t));

1 0

[22953] trunk/launchd/src/init.c
by source_changes＠macosforge.org 16 Nov '06

16 Nov '06

Revision: 22953 http://trac.macosforge.org/projects/launchd/changeset/22953 Author: zarzycki(a)apple.com Date: 2006-11-16 11:17:39 -0800 (Thu, 16 Nov 2006) Log Message: ----------- Dead code deletion. Modified Paths: -------------- trunk/launchd/src/init.c Modified: trunk/launchd/src/init.c =================================================================== --- trunk/launchd/src/init.c 2006-11-16 18:42:11 UTC (rev 22952) +++ trunk/launchd/src/init.c 2006-11-16 19:17:39 UTC (rev 22953) @@ -110,8 +110,6 @@ static void single_user(void); static void runcom(void); -static bool runcom_safe = false; -static bool runcom_netboot = false; static bool single_user_mode = false; static bool run_runcom = true; static pid_t single_user_pid = 0; @@ -176,25 +174,10 @@ void init_boot(bool sflag) { - int nbmib[2] = { CTL_KERN, KERN_NETBOOT }; - int sbmib[2] = { CTL_KERN, KERN_SAFEBOOT }; - uint32_t v = 0; - size_t vsz = sizeof(v); - if (sflag) { single_user_mode = true; run_runcom = false; } - - if (launchd_assumes(sysctl(nbmib, 2, &v, &vsz, NULL, 0) != -1)) { - if (v != 0) - runcom_netboot = true; - } - if (launchd_assumes(sysctl(sbmib, 2, &v, &vsz, NULL, 0) != -1)) { - if (v != 0) - runcom_safe = true; - } - } void @@ -308,10 +291,6 @@ setctty(_PATH_CONSOLE, O_POPUP); setenv("TERM", "vt100", 1); - setenv("SafeBoot", runcom_safe ? "-x" : "", 1); - setenv("VerboseFlag", "-v", 1); /* single user mode implies verbose mode */ - setenv("FsckSlash", runcom_fsck ? "-F" : "", 1); - setenv("NetBoot", runcom_netboot ? "-N" : "", 1); if (runcom_fsck) { fprintf(stdout, "Singleuser boot -- fsck not done\n"); @@ -365,7 +344,6 @@ static void runcom(void) { - bool runcom_fsck = should_fsck(); char *argv[] = { "/bin/launchctl", "bootstrap", NULL }; struct termios term; int vdisable; @@ -406,10 +384,6 @@ syslog(LOG_WARNING, "tcsetattr(\"%s\") %m", _PATH_CONSOLE); } - setenv("SafeBoot", runcom_safe ? "-x" : "", 1); - setenv("FsckSlash", runcom_fsck ? "-F" : "", 1); - setenv("NetBoot", runcom_netboot ? "-N" : "", 1); - execv(argv[0], argv); stall("can't exec %s for %s: %m", _PATH_BSHELL, _PATH_RUNCOM); exit(EXIT_FAILURE);

1 0