aboutsummaryrefslogtreecommitdiff
path: root/init.d
diff options
context:
space:
mode:
Diffstat (limited to 'init.d')
-rw-r--r--init.d/bootmisc.in2
-rw-r--r--init.d/consolefont.in12
-rw-r--r--init.d/keymaps.in6
-rw-r--r--init.d/localmount.in2
-rw-r--r--init.d/mount-ro.in2
-rw-r--r--init.d/net.lo.in2
-rw-r--r--init.d/netmount.in2
-rw-r--r--init.d/savecache.in8
8 files changed, 18 insertions, 18 deletions
diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index b2356c89..aa14a75d 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -74,7 +74,7 @@ mkutmp()
start()
{
# Remove any added console dirs
- rm -rf "$RC_LIBDIR"/console
+ rm -rf "$RC_LIBEXECDIR"/console
local logw=false runw=false
# Ensure that our basic dirs exist
diff --git a/init.d/consolefont.in b/init.d/consolefont.in
index 5900ef72..ecd36660 100644
--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -52,17 +52,17 @@ start()
eend $retval
# Store the last font so we can use it ASAP on boot
- if [ $retval -eq 0 -a -w "$RC_LIBDIR" ]; then
- mkdir -p "$RC_LIBDIR"/console
+ if [ $retval -eq 0 -a -w "$RC_LIBEXECDIR" ]; then
+ mkdir -p "$RC_LIBEXECDIR"/console
for font in /usr/share/consolefonts/"$consolefont".*; do
:
done
- cp "$font" "$RC_LIBDIR"/console
- echo "${font##*/}" >"$RC_LIBDIR"/console/font
+ cp "$font" "$RC_LIBEXECDIR"/console
+ echo "${font##*/}" >"$RC_LIBEXECDIR"/console/font
if yesno ${unicode:-${UNICODE}}; then
- echo "" > "$RC_LIBDIR"/console/unicode
+ echo "" > "$RC_LIBEXECDIR"/console/unicode
else
- rm -f "$RC_LIBDIR"/console/unicode
+ rm -f "$RC_LIBEXECDIR"/console/unicode
fi
fi
diff --git a/init.d/keymaps.in b/init.d/keymaps.in
index 1eff0612..4af5f94a 100644
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -67,8 +67,8 @@ start()
eend 0
# Save the keymapping for use immediately at boot
- if [ -w "$RC_LIBDIR" ]; then
- mkdir -p "$RC_LIBDIR"/console
- dumpkeys >"$RC_LIBDIR"/console/keymap
+ if [ -w "$RC_LIBEXECDIR" ]; then
+ mkdir -p "$RC_LIBEXECDIR"/console
+ dumpkeys >"$RC_LIBEXECDIR"/console/keymap
fi
}
diff --git a/init.d/localmount.in b/init.d/localmount.in
index ff82ed44..02268222 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -52,7 +52,7 @@ stop()
# Flush all pending disk writes now
sync; sync
- . "$RC_LIBDIR"/sh/rc-mount.sh
+ . "$RC_LIBEXECDIR"/sh/rc-mount.sh
# Umount loopback devices
einfo "Unmounting loopback devices"
diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 6b237c35..c6275bb6 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -17,7 +17,7 @@ start()
ebegin "Remounting remaining filesystems read-only"
# We need the do_unmount function
- . "$RC_LIBDIR"/sh/rc-mount.sh
+ . "$RC_LIBEXECDIR"/sh/rc-mount.sh
eindent
local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${RC_SVCDIR}" x= fs=
m="$m|/bin|/sbin|/lib|/libexec"
diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 845b32cc..5c7f43aa 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -2,7 +2,7 @@
# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
# All rights reserved. Released under the 2-clause BSD license.
-MODULESDIR="${RC_LIBDIR}/net"
+MODULESDIR="${RC_LIBEXECDIR}/net"
MODULESLIST="${RC_SVCDIR}/nettree"
_config_vars="config routes"
diff --git a/init.d/netmount.in b/init.d/netmount.in
index 1b88a27b..39f542a4 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -74,7 +74,7 @@ stop()
local x= fs=
ebegin "Unmounting network filesystems"
- . "$RC_LIBDIR"/sh/rc-mount.sh
+ . "$RC_LIBEXECDIR"/sh/rc-mount.sh
for x in $net_fs_list; do
fs="$fs${fs:+,}$x"
diff --git a/init.d/savecache.in b/init.d/savecache.in
index ea011c14..799b8bc5 100644
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -14,9 +14,9 @@ start()
fi
fi
ebegin "Saving dependency cache"
- if [ ! -d "$RC_LIBDIR"/cache ]; then
- rm -rf "$RC_LIBDIR"/cache
- if ! mkdir "$RC_LIBDIR"/cache; then
+ if [ ! -d "$RC_LIBEXECDIR"/cache ]; then
+ rm -rf "$RC_LIBEXECDIR"/cache
+ if ! mkdir "$RC_LIBEXECDIR"/cache; then
eend $?
return $?
fi
@@ -26,7 +26,7 @@ start()
[ -e "$RC_SVCDIR/$x" ] && save="$save $RC_SVCDIR/$x"
done
if [ -n "$save" ]; then
- cp -p $save "$RC_LIBDIR"/cache 2>/dev/null
+ cp -p $save "$RC_LIBEXECDIR"/cache 2>/dev/null
fi
eend $?
}