diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-06-01 12:57:32 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-06-01 12:57:32 -0300 |
| commit | a8a948b7ae57f660f61ce44251f938d9317c113b (patch) | |
| tree | 519d9eb03bc0352e6a084c336f63bcc7ae00e794 /rc.multi | |
| parent | 10c7127d5ff693a8f0c9671b9d3253315f2095be (diff) | |
| parent | a20ce0e666b5c97080a880eee9d8301c3d48b177 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.06.1
Conflicts:
hostname.5.txt
locale.conf.5.txt
Diffstat (limited to 'rc.multi')
| -rwxr-xr-x | rc.multi | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -9,10 +9,10 @@ run_hook multi_start # Load sysctl config files -[[ -x /usr/lib/initscripts/arch-sysctl ]] && /usr/lib/initscripts/arch-sysctl +/usr/lib/systemd/systemd-sysctl # Load additional binary formats -[[ -x /usr/lib/initscripts/arch-binfmt ]] && /usr/lib/initscripts/arch-binfmt +/usr/lib/systemd/systemd-binfmt # Start daemons for daemon in "${DAEMONS[@]}"; do |