aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sh/migrate-to-run.sh.in25
-rw-r--r--src/librc/rc.h.in2
2 files changed, 13 insertions, 14 deletions
diff --git a/sh/migrate-to-run.sh.in b/sh/migrate-to-run.sh.in
index 6689f883..73978e7c 100644
--- a/sh/migrate-to-run.sh.in
+++ b/sh/migrate-to-run.sh.in
@@ -9,39 +9,38 @@ if ! mountinfo -q -f tmpfs "@LIBEXECDIR@/init.d"; then
exit 0
fi
-if [ ! -d "@PREFIX@/run" ]; then
- eerror "'@PREFIX@/run' is not a directory."
+if [ ! -d /run ]; then
+ eerror "/run is not a directory."
eerror "This means the OpenRC dependency data cannot be migrated."
- eerror "Please create the '@PREFIX@/run' directory and reboot the system."
+ eerror "Please create the /run directory and reboot the system."
exit 1
fi
-if ! mountinfo -q -f tmpfs "@PREFIX@/run"; then
- for x in "@PREFIX@/run/."* "@PREFIX@/run/"*; do
+if ! mountinfo -q -f tmpfs /run; then
+ for x in /run/.* /run/*; do
case "$x" in
- "@PREFIX@/run/."|"@PREFIX@/run/..")
+ /run/.|/run/..)
continue
;;
esac
if [ -e "$x" ]; then
- eerror "Your '@PREFIX@/run' directory contains files."
+ eerror "Your /run directory contains files."
eerror "Please reboot the system."
exit 1
fi
done
- mount -t tmpfs -o mode=0755,nosuid,nodev \
- tmpfs "@PREFIX@/run" 2> /dev/null
+ mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /run 2> /dev/null
if [ $? != 0 ]; then
- eerror "Unable to mount a tmpfs on '@PREFIX@/run'."
+ eerror "Unable to mount a tmpfs on /run."
eerror "This means the OpenRC dependency data cannot be migrated."
- eerror "Please create the '@PREFIX@/run' directory and reboot the system."
+ eerror "Please create the /run directory and reboot the system."
exit 1
fi
fi
-rm -rf "@PREFIX@/run/openrc"
-cp -a "@LIBEXECDIR@/init.d" "@PREFIX@/run/openrc"
+rm -rf /run/openrc
+cp -a "@LIBEXECDIR@/init.d" /run/openrc
rc-update -u
umount "@LIBEXECDIR@/init.d"
rm -rf "@LIBEXECDIR@/init.d"
diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in
index b5a87b5e..c2a919fc 100644
--- a/src/librc/rc.h.in
+++ b/src/librc/rc.h.in
@@ -40,7 +40,7 @@ __BEGIN_DECLS
#if defined(PREFIX)
#define RC_SVCDIR RC_LIBEXECDIR "/init.d"
#elif defined(__linux__)
-#define RC_SVCDIR "@PREFIX@/run/openrc"
+#define RC_SVCDIR "/run/openrc"
#else
#define RC_SVCDIR RC_LIBEXECDIR "/init.d"
#endif