Index: head/libexec/rc/rc.d/abi =================================================================== --- head/libexec/rc/rc.d/abi (revision 352998) +++ head/libexec/rc/rc.d/abi (nonexistent) @@ -1,54 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: abi -# REQUIRE: archdep -# KEYWORD: nojail - -. /etc/rc.subr - -name="abi" -desc="Enable foreign ABIs" -start_cmd="${name}_start" -stop_cmd=":" - -linux_start() -{ - local _tmpdir - - echo -n ' linux' - load_kld -e 'linux(aout|elf)' linux - case `sysctl -n hw.machine_arch` in - amd64) - load_kld -e 'linux64elf' linux64 - ;; - esac - if [ -x /compat/linux/sbin/ldconfigDisabled ]; then - _tmpdir=`mktemp -d -t linux-ldconfig` - /compat/linux/sbin/ldconfig -C ${_tmpdir}/ld.so.cache - if ! cmp -s ${_tmpdir}/ld.so.cache /compat/linux/etc/ld.so.cache; then - cat ${_tmpdir}/ld.so.cache > /compat/linux/etc/ld.so.cache - fi - rm -rf ${_tmpdir} - fi -} - -abi_start() -{ - local _echostop - - _echostop= - if checkyesno linux_enable; then - echo -n 'Additional ABI support:' - _echostop=yes - fi - - checkyesno linux_enable && linux_start - - [ -n "${_echostop}" ] && echo '.' -} - -load_rc_config $name -run_rc_command "$1" Property changes on: head/libexec/rc/rc.d/abi ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/libexec/rc/rc.d/Makefile =================================================================== --- head/libexec/rc/rc.d/Makefile (revision 352998) +++ head/libexec/rc/rc.d/Makefile (revision 352999) @@ -1,334 +1,334 @@ # $FreeBSD$ .include CONFDIR= /etc/rc.d CONFGROUPS= CONFS CONFSPACKAGE= rc CONFS= DAEMON \ FILESYSTEMS \ LOGIN \ NETWORKING \ SERVERS \ - abi \ addswap \ adjkerntz \ archdep \ bgfsck \ ${_blacklistd} \ bridge \ cfumass \ cleanvar \ cleartmp \ cron \ ctld \ ddb \ defaultroute \ devd \ devfs \ devmatch \ dhclient \ dmesg \ dumpon \ fsck \ gbde \ geli \ geli2 \ gptboot \ growfs \ gssd \ hostid \ hostid_save \ hostname \ iovctl \ ip6addrctl \ ipsec \ ${_kadmind} \ ${_kdc} \ ${_kfd} \ kld \ kldxref \ ${_kpasswdd} \ ldconfig \ + linux \ local \ localpkg \ lockd \ mixer \ motd \ mountcritlocal \ mountcritremote \ mountlate \ mdconfig \ mdconfig2 \ mountd \ msgs \ natd \ netif \ netoptions \ netwait \ newsyslog \ nfsclient \ nfscbd \ nfsd \ nfsuserd \ nisdomain \ ${_nscd} \ nsswitch \ ntpdate \ ${_opensm} \ pf \ pflog \ pfsync \ ppp \ pppoed \ pwcheck \ quota \ random \ rarpd \ rctl \ resolv \ root \ route6d \ routing \ rpcbind \ rtadvd \ rtsold \ rwho \ savecore \ securelevel \ serial \ sppp \ statd \ static_arp \ static_ndp \ stf \ swap \ swaplate \ sysctl \ syslogd \ sysvipc \ tmp \ ugidfw \ ${_utx} \ var \ watchdogd .if ${MK_NIS} != "no" CONFS+= ypbind \ ypldap \ yppasswdd \ ypserv \ ypset \ ypupdated \ ypxfrd .endif .if ${MK_ACCT} != "no" CONFGROUPS+= ACCT ACCT+= accounting ACCTPACKAGE= acct .endif .if ${MK_ACPI} != "no" CONFGROUPS+= ACPI ACPI= power_profile ACPIPACKAGE= acpi .endif .if ${MK_ACPI} != "no" || ${MK_APM} != "no" CONFS+= powerd .endif .if ${MK_AMD} != "no" CONFGROUPS+= AMD AMD+= amd AMDPACKAGE= amd .endif .if ${MK_APM} != "no" CONFGROUPS+= APM APM+= apm .if ${MACHINE} == "i386" APM+= apmd .endif APMPACKAGE= apm .endif .if ${MK_AUDIT} != "no" CONFGROUPS+= AUDIT AUDIT+= auditd AUDIT+= auditdistd .endif .if ${MK_AUTOFS} != "no" CONFS+= automount CONFS+= automountd CONFS+= autounmountd .endif .if ${MK_BLACKLIST} != "no" _blacklistd+= blacklistd .endif .if ${MK_BLUETOOTH} != "no" CONFGROUPS+= BLUETOOTH BLUETOOTH+= bluetooth \ bthidd \ hcsecd \ rfcomm_pppd_server \ sdpd \ ubthidhci BLUETOOTHPACKAGE= bluetooth .endif .if ${MK_BOOTPARAMD} != "no" CONFS+= bootparams .endif .if ${MK_BSNMP} != "no" CONFGROUPS+= BSNMP BSNMP+= bsnmpd BSNMPPACKAGE= bsnmp .endif .if ${MK_CCD} != "no" CONFS+= ccd .endif .if ${MK_FTP} != "no" CONFS+= ftpd .endif .if ${MK_HAST} != "no" CONFGROUPS+= HAST HAST= hastd HASTPACKAGE= hast .endif .if ${MK_INETD} != "no" CONFS+= inetd .endif .if ${MK_IPFILTER} != "no" CONFS+= ipfilter \ ipfs \ ipmon \ ipnat \ ippool .endif .if ${MK_IPFW} != "no" CONFS+= ipfw .if ${MK_NETGRAPH} != "no" CONFS+= ipfw_netflow .endif .endif .if ${MK_ISCSI} != "no" CONFS+= iscsictl CONFS+= iscsid .endif .if ${MK_JAIL} != "no" CONFGROUPS+= JAIL JAIL+= jail JAILPACKAGE= jail .endif .if ${MK_LEGACY_CONSOLE} != "no" CONFS+= moused CONFS+= syscons .endif .if ${MK_LPR} != "no" CONFS+= lpd .endif .if ${MK_KERBEROS} != "no" CONFS+= ipropd_master CONFS+= ipropd_slave _kadmind= kadmind _kdc= kdc _kfd= kfd _kpasswdd= kpasswdd DIRS+= VAR_HEMIDAL VAR_HEMIDAL= /var/heimdal VAR_HEMIDAL_MODE= 700 .endif .if ${MK_MAIL} != "no" CONFS+= othermta .endif .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif .if ${MK_NTP} != "no" CONFS+= ntpd .endif .if ${MK_OFED} != "no" _opensm= opensm .endif .if ${MK_OPENSSL} != "no" CONFS+= keyserv .endif .if ${MK_OPENSSH} != "no" CONFGROUPS+= SSH SSH= sshd SSHPACKAGE= ssh .endif .if ${MK_PF} != "no" CONFS+= ftp-proxy .endif .if ${MK_ROUTED} != "no" CONFS+= routed .endif .if ${MK_SENDMAIL} != "no" CONFGROUPS+= SMRCD SMRCD= sendmail SMRCDPACKAGE= sendmail .endif .if ${MK_UNBOUND} != "no" CONFGROUPS+= UNBOUND UNBOUND+= local_unbound UNBOUNDPACKAGE= unbound .endif .if ${MK_UTMPX} != "no" _utx= utx .endif .if ${MK_VI} != "no" CONFGROUPS+= VI VI+= virecover VIPACKAGE= vi .endif .if ${MK_WIRELESS} != "no" CONFS+= hostapd CONFS+= wpa_supplicant .endif .if ${MK_ZFS} != "no" CONFGROUPS+= ZFS ZFS+= zfs ZFS+= zfsbe ZFS+= zfsd ZFS+= zvol .endif .for fg in ${CONFGROUPS} ${fg}MODE?= ${BINMODE} .endfor .include Index: head/libexec/rc/rc.d/SERVERS =================================================================== --- head/libexec/rc/rc.d/SERVERS (revision 352998) +++ head/libexec/rc/rc.d/SERVERS (revision 352999) @@ -1,10 +1,10 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: SERVERS -# REQUIRE: mountcritremote sysvipc abi ldconfig savecore watchdogd +# REQUIRE: mountcritremote sysvipc linux ldconfig savecore watchdogd # This is a dummy dependency, for early-start servers relying on # some basic configuration. Index: head/libexec/rc/rc.d/linux =================================================================== --- head/libexec/rc/rc.d/linux (nonexistent) +++ head/libexec/rc/rc.d/linux (revision 352999) @@ -0,0 +1,38 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: linux +# REQUIRE: archdep +# KEYWORD: nojail + +. /etc/rc.subr + +name="linux" +desc="Enable Linux ABI" +start_cmd="${name}_start" +stop_cmd=":" + +linux_start() +{ + local _tmpdir + + load_kld -e 'linux(aout|elf)' linux + case `sysctl -n hw.machine_arch` in + amd64) + load_kld -e 'linux64elf' linux64 + ;; + esac + if [ -x /compat/linux/sbin/ldconfigDisabled ]; then + _tmpdir=`mktemp -d -t linux-ldconfig` + /compat/linux/sbin/ldconfig -C ${_tmpdir}/ld.so.cache + if ! cmp -s ${_tmpdir}/ld.so.cache /compat/linux/etc/ld.so.cache; then + cat ${_tmpdir}/ld.so.cache > /compat/linux/etc/ld.so.cache + fi + rm -rf ${_tmpdir} + fi +} + +load_rc_config $name +run_rc_command "$1" Property changes on: head/libexec/rc/rc.d/linux ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/libexec/rc/rc.d/localpkg =================================================================== --- head/libexec/rc/rc.d/localpkg (revision 352998) +++ head/libexec/rc/rc.d/localpkg (revision 352999) @@ -1,78 +1,78 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: localpkg -# REQUIRE: sysvipc abi +# REQUIRE: sysvipc linux # BEFORE: securelevel # KEYWORD: shutdown . /etc/rc.subr name="localpkg" desc="Run local init scripts" start_cmd="pkg_start" stop_cmd="pkg_stop" pkg_start() { local initdone # For each dir in $local_startup, search for init scripts matching *.sh # case ${local_startup} in [Nn][Oo] | '') ;; *) initdone= find_local_scripts_old for script in ${zlist} ${slist}; do if [ -z "${initdone}" -a -f "${script}" ]; then echo -n 'Local package initialization:' initdone=yes fi if [ -x "${script}" ]; then (set -T trap 'exit 1' 2 ${script} start) elif [ -f "${script}" -o -L "${script}" ]; then echo -n " (skipping ${script}, not executable)" fi done [ -n "${initdone}" ] && echo '.' ;; esac } pkg_stop() { local initdone case ${local_startup} in [Nn][Oo] | '') ;; *) initdone= find_local_scripts_old for script in `reverse_list ${slist} ${zlist}`; do if [ -z "${initdone}" -a -f "${script}" ]; then echo -n 'Shutting down local packages:' initdone=yes fi if [ -x "${script}" ]; then if [ `sysctl -n debug.bootverbose` -eq 1 ]; then echo "==>" ${script} fi (set -T trap 'exit 1' 2 ${script} stop) fi done [ -n "${initdone}" ] && echo '.' ;; esac } load_rc_config $name run_rc_command "$1"