[arch-commits] Commit in udev/trunk (udev.install)

[Thomas Bächler]

    Date: Monday, September 6, 2010 @ 01:23:22
  Author: thomas
Revision: 90004

Make sure mknod doesn't fail with 'file exists', fixes FS#18232

Modified:
  udev/trunk/udev.install

--------------+
 udev.install |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

Modified: udev.install
===================================================================
--- udev.install	2010-09-05 22:24:48 UTC (rev 90003)
+++ udev.install	2010-09-06 05:23:22 UTC (rev 90004)
@@ -19,9 +19,18 @@
   ROOTDIR=""
   [ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && ROOTDIR=$(mktemp -d /tmp/udevinstall.XXXXXX)
   [ -n "${ROOTDIR}" ] && mount --bind / ${ROOTDIR}
-  [ -c ${ROOTDIR}/dev/console ] || mknod -m600 ${ROOTDIR}/dev/console c 5 1
-  [ -c ${ROOTDIR}/dev/null ]    || mknod -m644 ${ROOTDIR}/dev/null c 1 3
-  [ -c ${ROOTDIR}/dev/zero ]    || mknod -m644 ${ROOTDIR}/dev/zero c 1 5
+  if [ ! -c ${ROOTDIR}/dev/console ]; then
+    rm -f ${ROOTDIR}/dev/console
+    mknod -m600 ${ROOTDIR}/dev/console c 5 1
+  fi
+  if [ ! -c ${ROOTDIR}/dev/null ]; then
+    rm -f ${ROOTDIR}/dev/null
+    mknod -m644 ${ROOTDIR}/dev/null c 1 3
+  fi
+  if [ ! -c ${ROOTDIR}/dev/zero ]; then
+    rm ${ROOTDIR}/dev/zero
+    mknod -m644 ${ROOTDIR}/dev/zero c 1 5
+  fi
   if [ -n "${ROOTDIR}" ]; then
     umount ${ROOTDIR}
     rmdir ${ROOTDIR}