aboutsummaryrefslogtreecommitdiff
path: root/rc.sysinit
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2012-01-12 22:42:59 (GMT)
committerTom Gundersen <teg@jklm.no>2012-01-12 22:44:08 (GMT)
commit748db5c108758fd1c54efb4fc3a2e18345646230 (patch)
tree72306576808efad706eacc2cd600a3da3348cad6 /rc.sysinit
parent762c21b995db16fba04bba27414d88ec324f70bb (diff)
downloadinitscripts-748db5c108758fd1c54efb4fc3a2e18345646230.tar.xz
/dev: remove non-devtmpfs support
Udev requires devtmpfs to work, so no point in pretending that the system will work without it. Signed-off-by: Tom Gundersen <teg@jklm.no>
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-xrc.sysinit14
1 files changed, 2 insertions, 12 deletions
diff --git a/rc.sysinit b/rc.sysinit
index 602ef1f..3f09bfd 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -15,8 +15,7 @@ printsep
mountpoint -q /proc || mount -n -t proc proc /proc -o nosuid,noexec,nodev
mountpoint -q /sys || mount -n -t sysfs sys /sys -o nosuid,noexec,nodev
mountpoint -q /run || mount -n -t tmpfs run /run -o mode=0755,nosuid,nodev
-mountpoint -q /dev || mount -n -t devtmpfs udev /dev -o mode=0755,nosuid ||
- mount -n -t tmpfs udev /dev -o mode=0755,nosuid
+mountpoint -q /dev || mount -n -t devtmpfs dev /dev -o mode=0755,nosuid
mkdir -p -m 1777 /run/lock
mkdir -p /dev/{pts,shm}
mountpoint -q /dev/pts || mount -n /dev/pts &>/dev/null ||
@@ -56,18 +55,9 @@ if [[ $HWCLOCK_PARAMS ]]; then
stat_busy "Adjusting system time and setting kernel timezone"
# enable rtc access
modprobe -q -a rtc-cmos rtc genrtc
- # If devtmpfs is used, the required RTC device already exists now
- # Otherwise, create whatever device is available
- if ! [[ -c /dev/rtc || -c /dev/rtc0 ]]; then
- for dev in /sys/class/rtc/rtc0/dev /sys/class/misc/rtc/dev; do
- [[ -e $dev ]] || continue
- IFS=: read -r major minor < "$dev"
- mknod /dev/rtc c $major $minor
- done
- fi
# Adjust the system time for timezone offset if rtc is not in UTC
- # 1. Make creation time on udev nodes sane (FS#8665)
+ # 1. Make creation time on device nodes sane (FS#8665)
# 2. Filesystem checks can depend on system time
# 3. This also sets the kernel time zone, used by e.g. vfat
# If TIMEZONE is not set in rc.conf, the timezone stored in /etc/localtime