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

Thomas Baechler thomas at archlinux.org
Fri Sep 19 21:58:53 UTC 2008


    Date: Friday, September 19, 2008 @ 17:58:53
  Author: thomas
Revision: 12761

The old post_install was wrong, here is the fix

Modified:
  udev/trunk/udev.install

--------------+
 udev.install |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Modified: udev.install
===================================================================
--- udev.install	2008-09-19 21:58:27 UTC (rev 12760)
+++ udev.install	2008-09-19 21:58:53 UTC (rev 12761)
@@ -15,15 +15,15 @@
 post_install() {
   # If a ramfs is mounted, we still need to make sure that /dev/{console,null,zero} exist
   # The Archlinux installer bind-mounts /dev to /mnt/dev, thus making the real /dev invisible
-  DEVDIR="/dev"
-  [ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && DEVDIR=$(mktemp -d /tmp/udevinstall.XXXXXX)
-  [ "${DEVDIR}" != "/dev" ] && mount --bind /dev ${DEVDIR}
-  [ -c ${DEVDIR}/console ] || mknod -m600 ${DEVDIR}/console c 5 1
-  [ -c ${DEVDIR}/null ]    || mknod -m644 ${DEVDIR}/null c 1 3
-  [ -c ${DEVDIR}/zero ]    || mknod -m644 ${DEVDIR}/zero c 1 5
-  if [ "${DEVDIR}" != "/dev" ]; then
-    umount ${DEVDIR}
-    rmdir ${DEVDIR}
+  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 [ -n "${ROOTDIR}" ]; then
+    umount ${ROOTDIR}
+    rmdir ${ROOTDIR}
   fi
 }
 




More information about the arch-commits mailing list