[d-i-commits] r32023 - in trunk/packages/rootskel: debian src/lib/debian-installer

[Colin Watson]

Author: cjwatson
Date: 2005-11-14 13:17:16 +0000 (Mon, 14 Nov 2005)
New Revision: 32023

Modified:
   trunk/packages/rootskel/debian/changelog
   trunk/packages/rootskel/src/lib/debian-installer/init-udev-devices
Log:
* src/lib/debian-installer/init-udev-devices: Skip creating devices and
  directories if they already exist.

Modified: trunk/packages/rootskel/debian/changelog
===================================================================
--- trunk/packages/rootskel/debian/changelog	2005-11-14 12:54:14 UTC (rev 32022)
+++ trunk/packages/rootskel/debian/changelog	2005-11-14 13:17:16 UTC (rev 32023)
@@ -1,8 +1,13 @@
 rootskel (1.24) UNRELEASED; urgency=low
 
+  [ Frans Pop ]
   * In S60frontend only allow the gtk frontend if framebuffer is available
     and the system has sufficient memory (for now: 92 MiB).
 
+  [ Colin Watson ]
+  * src/lib/debian-installer/init-udev-devices: Skip creating devices and
+    directories if they already exist.
+
  -- Frans Pop <fjp at debian.org>  Sun, 13 Nov 2005 19:41:52 +0100
 
 rootskel (1.23) unstable; urgency=low

Modified: trunk/packages/rootskel/src/lib/debian-installer/init-udev-devices
===================================================================
--- trunk/packages/rootskel/src/lib/debian-installer/init-udev-devices	2005-11-14 12:54:14 UTC (rev 32022)
+++ trunk/packages/rootskel/src/lib/debian-installer/init-udev-devices	2005-11-14 13:17:16 UTC (rev 32023)
@@ -1,15 +1,23 @@
 #! /bin/sh
 
+makedev () {
+	[ -e "$2" ] || mknod -m "$1" "$2" "$3" "$4" "$5"
+}
+
+makedir () {
+	[ -d "$2" ] || mkdir -m "$1" "$2"
+}
+
 # Create just enough devices to cope until udev starts.
-mknod -m 600 /dev/console c 5 1
-mknod -m 666 /dev/null c 1 3
-mkdir -m 755 /dev/rd
-mknod -m 660 /dev/rd/0 b 1 0
-mkdir -m 755 /dev/vc
+makedev 600 /dev/console c 5 1
+makedev 666 /dev/null c 1 3
+makedir 755 /dev/rd
+makedev 660 /dev/rd/0 b 1 0
+makedir 755 /dev/vc
 for i in 0 1 2 3 4; do
-	mknod -m 600 /dev/vc/"$i" c 4 "$i"
+	makedev 600 /dev/vc/"$i" c 4 "$i"
 done
-mkdir -m 755 /dev/tts
+makedir 755 /dev/tts
 for i in 0 1; do
-	mknod -m 600 /dev/tts/"$i" c 4 "$(($i + 64))"
+	makedev 600 /dev/tts/"$i" c 4 "$(($i + 64))"
 done