summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-06-11 14:42:49 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-06-11 14:42:49 -0300
commitbd6b5d7f38b6cd98302162068bcb4162bf14c095 (patch)
treefa37ef0af2a2a03365ca3995c0524addd79f75fc /functions
parenta8a948b7ae57f660f61ce44251f938d9317c113b (diff)
parentdd4843aa1525716c3a9916042f2de472eb0f064c (diff)
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.06.11
Diffstat (limited to 'functions')
-rw-r--r--functions11
1 files changed, 1 insertions, 10 deletions
diff --git a/functions b/functions
index f03cccb..a168c7f 100644
--- a/functions
+++ b/functions
@@ -347,7 +347,7 @@ kill_all() {
load_modules() {
local rc=0
- /usr/lib/systemd/systemd-modules-load
+ /usr/lib/systemd/systemd-modules-load &>/dev/null
rc=$?
if (( ${#MODULES[*]} )); then
@@ -590,15 +590,6 @@ umount_all() {
remove_leftover() {
status -v 'Removing Leftover Files' systemd-tmpfiles --create --remove
- # move from static /var/{run,lock} to /run
- if [[ ! -L /var/lock ]]; then
- rm -rf /var/lock
- ln -s /run/lock /var/lock
- fi
- if [[ ! -L /var/run ]]; then
- rm -rf /var/run
- ln -s /run /var/run
- fi
}
bootlogd_stop() {