[arch-commits] Commit in udev/repos (3 files)

[Tobias Powalowski]

    Date: Sunday, September 21, 2008 @ 08:10:36
  Author: tpowa
Revision: 12816

Merged revisions 12722-12815 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/udev/trunk

........
  r12761 | thomas | 2008-09-19 21:58:53 +0000 (Fr, 19 Sep 2008) | 2 lines
  
  The old post_install was wrong, here is the fix
........
  r12814 | tpowa | 2008-09-21 12:07:12 +0000 (So, 21 Sep 2008) | 1 line
  
  upgpkg: udev 128-5
........

Modified:
  udev/repos/testing-x86_64/	(properties)
  udev/repos/testing-x86_64/PKGBUILD
  udev/repos/testing-x86_64/udev.install

--------------+
 PKGBUILD     |    2 +-
 udev.install |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)


Property changes on: udev/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /udev/trunk:1-12721
   + /udev/trunk:1-12815

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-09-21 12:07:49 UTC (rev 12815)
+++ testing-x86_64/PKGBUILD	2008-09-21 12:10:36 UTC (rev 12816)
@@ -4,7 +4,7 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=udev
 pkgver=128
-pkgrel=4
+pkgrel=5
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"

Modified: testing-x86_64/udev.install
===================================================================
--- testing-x86_64/udev.install	2008-09-21 12:07:49 UTC (rev 12815)
+++ testing-x86_64/udev.install	2008-09-21 12:10:36 UTC (rev 12816)
@@ -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
 }