Author: baggins
Date: Tue Dec 9 15:35:13 2008
New Revision: 10030
Modified:
rc-scripts/trunk/po/pl.po
rc-scripts/trunk/rc.d/rc.shutdown
rc-scripts/trunk/rc.d/rc.sysinit
rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp
rc-scripts/trunk/sysconfig/system
Log:
- removed DevFS support
Modified: rc-scripts/trunk/po/pl.po
==============================================================================
--- rc-scripts/trunk/po/pl.po (original)
+++ rc-scripts/trunk/po/pl.po Tue Dec 9 15:35:13 2008
@@ -83,10 +83,6 @@
msgid "Saving random seed"
msgstr "Zapisanie podstawy generatora losowego"
-#: .././rc.d/rc.sysinit:146
-msgid "Starting Device Filesystem Daemon"
-msgstr "Uruchamianie Zarz�dcy Systemu Plik�w Urz�dze� (devfsd)"
-
#: .././rc.d/rc.sysinit:245
msgid "Initializing USB keyboard"
msgstr "Inicjalizacja klawiatury USB"
@@ -428,10 +424,6 @@
msgid "Initializing USB controller"
msgstr "Inicjalizacja kontrolera USB"
-#: .././rc.d/rc.sysinit:141
-msgid "Mounting Device Filesystem"
-msgstr "Pod��czanie system�w plik�w urz�dze� (DEVfs)"
-
#: .././rc.d/rc.sysinit:561
msgid "Starting up RAID device %s"
msgstr "W��czanie urz�dzenia RAID %s"
Modified: rc-scripts/trunk/rc.d/rc.shutdown
==============================================================================
--- rc-scripts/trunk/rc.d/rc.shutdown (original)
+++ rc-scripts/trunk/rc.d/rc.shutdown Tue Dec 9 15:35:13 2008
@@ -64,10 +64,10 @@
sig=-15
retry=3
force=
- remaining=$(awk '!/(^#| proc | loopfs | devfs | devpts | shm | iso9660
| ramfs | tmpfs | sysfs | securityfs | squashfs |^none|^\/dev\/root| \/ )/
{print $2}' /proc/mounts)
+ remaining=$(awk '!/(^#| proc | loopfs | devpts | shm | iso9660 | ramfs
| tmpfs | sysfs | securityfs | squashfs |^none|^\/dev\/root| \/ )/ {print $2}'
/proc/mounts)
while [ -n "$remaining" -a "$retry" -gt 0 ]; do
show "Unmounting file systems"; busy
- ERRORS=$(umount -a $force -t noproc,devfs 2>&1); rc=$?
+ ERRORS=$(umount -a $force -t noproc 2>&1); rc=$?
# we might had unmounted /usr, recheck $TPUT availability
# but well. we need tput only for show() and busy() (ok() and
fail() messages are already cached)
@@ -85,7 +85,7 @@
fi
sleep 2
- remaining=$(awk '!/(^#| proc | loopfs | devfs | devpts | shm |
iso9660 | ramfs | tmpfs | sysfs | securityfs | squashfs |^none|^\/dev\/root| \/
)/ {print $2}' /proc/mounts)
+ remaining=$(awk '!/(^#| proc | loopfs | devpts | shm | iso9660
| ramfs | tmpfs | sysfs | securityfs | squashfs |^none|^\/dev\/root| \/ )/
{print $2}' /proc/mounts)
[ -z "$remaining" ] && break
fuser -k -m $sig $remaining > /dev/null
sleep 5
Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit (original)
+++ rc-scripts/trunk/rc.d/rc.sysinit Tue Dec 9 15:35:13 2008
@@ -209,23 +209,11 @@
# Unmount the initrd, if necessary
if grep -q /initrd /proc/mounts 2>/dev/null && ! grep -q /initrd/loopfs
/proc/mounts 2>/dev/null; then
- if [ -e /initrd/dev/.devfsd ]; then
- umount /initrd/dev
- fi
umount /initrd/dev 2>/dev/null
umount /initrd
/sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
fi
- # /dev must be also mounted before everything but only if we want use
them ;-)
- if is_yes "$MOUNT_DEVFS"; then
- run_cmd "Mounting Device Filesystem" mount -n -t devfs /dev /dev
- fi
- # set up devfsd
- if [ -e /dev/.devfsd -a -x /sbin/devfsd ]; then
- run_cmd "Starting Device Filesystem Daemon" /sbin/devfsd /dev
- fi
-
# Start logging console output since we have all /dev stuff setup
if [ "$RC_BOOTLOG" ]; then
/sbin/blogd
@@ -497,11 +485,10 @@
:>/etc/mtab
[ -f /etc/cryptomtab ] && :>/etc/cryptomtab
- # Enter root, /proc, /sys, devfs and other into mtab.
+ # Enter root, /proc, /sys and other into mtab.
mount -f /
mount -f /proc
[ -f /proc/bus/usb/devices ] && mount -f -t usbfs -o
devgid=78,devmode=664 usbfs /proc/bus/usb
- [ -e /dev/.devfsd ] && mount -f -t devfs devfs /dev
if grep -q sysfs /proc/mounts 2>/dev/null; then
mount -f -t sysfs sysfs /sys
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp Tue Dec 9 15:35:13 2008
@@ -40,7 +40,7 @@
exit 1
fi
-# modprobe ppp modules (udev and devfsd case)
+# modprobe ppp modules (udev case)
[ ! -e /dev/ppp ] && modprobe -s -k char-major-108
opts="lock"
Modified: rc-scripts/trunk/sysconfig/system
==============================================================================
--- rc-scripts/trunk/sysconfig/system (original)
+++ rc-scripts/trunk/sysconfig/system Tue Dec 9 15:35:13 2008
@@ -69,9 +69,6 @@
# Run /sbin/ldconfig at startup ?
RUN_LDCONFIG=no
-# Mount devfs (Device Filesystem, Obsolete) to /dev
-MOUNT_DEVFS=no
-
# Start udev (udev-core required)?
START_UDEV=yes
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
