From: greg@kroah.com <greg@kroah.com>
Date: Thu, 25 Dec 2003 05:47:14 +0000 (-0800)
Subject: [PATCH] more init script cleanups, the stop target now calls udev to cleanup instead... 
X-Git-Tag: 011~16
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=18c783a7e6acab9590980a54978a129f7b3dca81

[PATCH] more init script cleanups, the stop target now calls udev to cleanup instead of just removing the whole /udev directory.
---

diff --git a/etc/init.d/udev b/etc/init.d/udev
index c540057d2..0d26d0708 100644
--- a/etc/init.d/udev
+++ b/etc/init.d/udev
@@ -11,20 +11,8 @@ udev_dir=/udev
 sysfs_dir=/sys
 bin=/sbin/udev
 
-case "$1" in
-  start)
-	if [ ! -d $udev_dir ]; then
-		mkdir $udev_dir
-	fi
-	if [ ! -d $sysfs_dir ]; then
-		exit 1
-	fi
-	# propogate /udev from /sys - we only need this while we do not
-	# have initramfs and an early user-space with which to do early
-	# device bring up
-	action "Creating initial udev device nodes: " /bin/true
-	export ACTION=add
-	# add block devices and their partitions
+run_udev () {
+	# handle block devices and their partitions
 	for i in ${sysfs_dir}/block/*; do
 		# add each drive
 		export DEVPATH=${i#${sysfs_dir}}
@@ -49,14 +37,29 @@ case "$1" in
 			fi
 		done
 	done
+}
+
+
+case "$1" in
+  start)
+	if [ ! -d $udev_dir ]; then
+		mkdir $udev_dir
+	fi
+	if [ ! -d $sysfs_dir ]; then
+		exit 1
+	fi
+	# propogate /udev from /sys - we only need this while we do not
+	# have initramfs and an early user-space with which to do early
+	# device bring up
+	action "Creating initial udev device nodes: " /bin/true
+	export ACTION=add
+	run_udev 
 	;;
   stop)
   	# be careful
 	action "Removing udev device nodes: " /bin/true
-	if [ $udev_dir -a "$udev_dir" != "/" ]; then
-	  	# clear out /udev
-  		rm -rf ${udev_dir}/*
-	fi
+	export ACTION=remove
+	run_udev 
 	;;
   status)
   	if [ -d $udev_dir ]; then