From owner-p4-projects Tue Oct 15 17:10: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 127B837B404; Tue, 15 Oct 2002 17:09:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B1C6E37B401 for ; Tue, 15 Oct 2002 17:09:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B6D843E3B for ; Tue, 15 Oct 2002 17:09:57 -0700 (PDT) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9G09uMt084914 for ; Tue, 15 Oct 2002 17:09:56 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.3/Submit) id g9G09tFh084911 for perforce@freebsd.org; Tue, 15 Oct 2002 17:09:55 -0700 (PDT) Date: Tue, 15 Oct 2002 17:09:55 -0700 (PDT) Message-Id: <200210160009.g9G09tFh084911@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 19361 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19361 Change 19361 by green@green_laptop_2 on 2002/10/15 17:09:05 Execute the runcom scripts directly, instead of as an argument to /bin/sh, so that TE may transition based on them. Affected files ... .. //depot/projects/trustedbsd/mac/etc/Makefile#20 edit .. //depot/projects/trustedbsd/mac/sbin/init/init.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/Makefile#20 (text+ko) ==== @@ -12,8 +12,8 @@ inetd.conf login.access login.conf \ mac.conf motd modems netconfig networks newsyslog.conf \ phones printcap profile protocols \ - rc rc.atm rc.devfs rc.diskless1 rc.diskless2 rc.firewall rc.firewall6 \ - rc.network rc.network6 rc.pccard rc.sendmail rc.serial rc.shutdown \ + rc.atm rc.devfs rc.diskless1 rc.diskless2 rc.firewall rc.firewall6 \ + rc.network rc.network6 rc.pccard rc.sendmail rc.serial \ rc.subr rc.syscons rc.sysctl remote rpc services \ shells sysctl.conf syslog.conf usbd.conf \ etc.${MACHINE_ARCH}/disktab \ @@ -37,7 +37,7 @@ .endif # -rwxr-xr-x root:wheel, for the new cron root:wheel -BIN2= netstart pccard_ether rc.suspend rc.resume +BIN2= netstart pccard_ether rc.suspend rc.resume rc rc.shutdown DEFAULTS= rc.conf pccard.conf periodic.conf ==== //depot/projects/trustedbsd/mac/sbin/init/init.c#5 (text+ko) ==== @@ -737,6 +737,8 @@ #ifdef LOGIN_CAP setprocresources(RESOURCE_RC); #endif + execv(_PATH_RUNCOM, argv + 1); + warning("can't exec %s: %m", _PATH_RUNCOM); execv(_PATH_BSHELL, argv); stall("can't exec %s for %s: %m", _PATH_BSHELL, _PATH_RUNCOM); _exit(1); /* force single user mode */ @@ -1497,6 +1499,8 @@ #ifdef LOGIN_CAP setprocresources(RESOURCE_RC); #endif + execv(_PATH_RUNCOM, argv + 1); + warning("can't exec %s: %m", _PATH_RUNDOWN); execv(_PATH_BSHELL, argv); warning("can't exec %s for %s: %m", _PATH_BSHELL, _PATH_RUNDOWN); _exit(1); /* force single user mode */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message