aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rw-r--r--functions2
-rwxr-xr-xnetwork2
-rwxr-xr-xrc.sysinit4
-rw-r--r--tmpfiles.conf2
5 files changed, 8 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 9fd2347..b2256ec 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ DIRS := \
/etc/rc.d/functions.d \
/etc/logrotate.d \
/sbin \
+ /etc/tmpfiles.d \
/usr/lib/tmpfiles.d \
/usr/lib/initscripts \
/etc/bash_completion.d \
diff --git a/functions b/functions
index a35e45e..f42c21e 100644
--- a/functions
+++ b/functions
@@ -531,7 +531,7 @@ need_root() {
# Quit script if it's not running by root
# This can be disabled in scripts sourcing functions by setting NEED_ROOT=0
# A local call to need_root can be done to ensure part of script need root privilege
-(( ${NEED_ROOT:-1} == 1 )) && need_root
+(( ${NEED_ROOT:-0} == 1 )) && need_root
# End of file
# vim: set ts=2 sw=2 noet:
diff --git a/network b/network
index 868780e..4fafb97 100755
--- a/network
+++ b/network
@@ -18,7 +18,7 @@ need_legacy() {
}
deprecated() {
- printf "${C_FAIL}Warning:${C_CLEAR} This functionality is deprecated.\n"
+ printf "${C_FAIL}Warning:${C_CLEAR} Your network settings are deprecated.\n"
printf " Please refer to /etc/rc.conf on how to define a single wired\n"
printf " connection, or use a utility such as netcfg.\n"
}
diff --git a/rc.sysinit b/rc.sysinit
index 45e64b6..a7daad9 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -35,6 +35,10 @@ run_hook sysinit_start
minilogd
bootlogd -p /run/bootlogd.pid
+if [[ ! -a /usr/lib ]] ; then
+ printf "${C_FAIL}/usr is on a separate partition. This is not supported.${C_OTHER}\n"
+fi
+
HWCLOCK_PARAMS="--systz"
case $HARDWARECLOCK in
"") ;;
diff --git a/tmpfiles.conf b/tmpfiles.conf
index f7db5a0..7dd1358 100644
--- a/tmpfiles.conf
+++ b/tmpfiles.conf
@@ -11,7 +11,7 @@ d /tmp/.XIM-unix 1777 root root
d /tmp/.font-unix 1777 root root
d /tmp/.Test-unix 1777 root root
-f /var/run/tmp 0664 root utmp
+F /var/run/utmp 0664 root utmp
r /tmp/.X[0-9]-lock
r /etc/nologin