Jak nie kultura to kulturystyka

[Cezary Krzyzanowski]

Drogi Arku.

Wypraszam sobie commit logi w takiej postaci pod moim adresem. A juĹź
jeżeli chcesz takie pisać, to bądź chociaż w nich uczciwy, a nie że o
mnie piszesz 'crapolla', a o własnym buractwie z symlinkami 'Revert,
conflicts seems more sane way'.

Pomijam już fakt, że wyraźnie zaznaczyłem potrzebę różnego sposobu
obsługi /bin/udev i /bin/udevd w initrd, a Ty dalej brniesz w
'kompatybilność' poprzez symlinki.

Cz w rny
-------------- następna część ---------
Author: arekm
Date: Mon Mar  5 13:35:29 2007
New Revision: 8359

Modified:
   geninitrd/trunk/geninitrd
Log:
More crapolla by czarny.

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd(original)
+++ geninitrd/trunk/geninitrdMon Mar  5 13:35:29 2007
@@ -1083,7 +1083,7 @@
 EOF
 fi
 cat >> "$s" <<- 'EOF'
-kill udevd
+killall udevd
 umount /proc
 umount /sys
 EOF
-------------- następna część ---------
Author: arekm
Date: Wed Feb  7 10:46:20 2007
New Revision: 8231

Modified:
   geninitrd/trunk/geninitrd
Log:
Make it backward compatible with previous udev versions.

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd   (original)
+++ geninitrd/trunk/geninitrd   Wed Feb  7 10:46:20 2007
@@ -57,7 +57,7 @@
 # is /dev on tmpfs. internal variable
 tmpfs_dev=
 
-if [ -f /etc/udev/udev.conf -a -x /sbin/initrd-udevd ]; then
+if [ -f /etc/udev/udev.conf ] && [ -x /sbin/initrd-udevd -o -x 
/sbin/initrd-udev ]; then
        USE_UDEV="yes"
        . /etc/udev/udev.conf
 fi
@@ -1236,7 +1236,11 @@
        mkdir -p $MNTIMAGE/etc/udev
        mkdir -p $MNTIMAGE/sys
 
-       inst /sbin/initrd-udevd $MNTIMAGE/sbin/udevd
+       if [ -x /sbin/initrd-udev ]; then
+               inst /sbin/initrd-udev $MNTIMAGE/sbin/udevd
+       else
+               inst /sbin/initrd-udevd $MNTIMAGE/sbin/udevd
+       fi
        inst /etc/udev/udev.conf $MNTIMAGE/etc/udev/udev.conf
 
        if is_yes "$USE_UDEV"; then

Author: arekm
Date: Wed Feb  7 11:07:03 2007
New Revision: 8232

Modified:
   geninitrd/trunk/geninitrd
Log:
Compat symlink.

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd   (original)
+++ geninitrd/trunk/geninitrd   Wed Feb  7 11:07:03 2007
@@ -1237,7 +1237,8 @@
        mkdir -p $MNTIMAGE/sys
 
        if [ -x /sbin/initrd-udev ]; then
-               inst /sbin/initrd-udev $MNTIMAGE/sbin/udevd
+               inst /sbin/initrd-udev $MNTIMAGE/sbin/udev
+               ln -sf udev $MNTIMAGE/sbin/udevd
        else
                inst /sbin/initrd-udevd $MNTIMAGE/sbin/udevd
        fi

Author: arekm
Date: Wed Feb  7 11:12:02 2007
New Revision: 8233

Modified:
   geninitrd/trunk/geninitrd
Log:
Revert, conflicts seems more sane way.

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd   (original)
+++ geninitrd/trunk/geninitrd   Wed Feb  7 11:12:02 2007
@@ -57,7 +57,7 @@
 # is /dev on tmpfs. internal variable
 tmpfs_dev=
 
-if [ -f /etc/udev/udev.conf ] && [ -x /sbin/initrd-udevd -o -x 
/sbin/initrd-udev ]; then
+if [ -f /etc/udev/udev.conf -a -x /sbin/initrd-udevd ]; then
        USE_UDEV="yes"
        . /etc/udev/udev.conf
 fi
@@ -1236,12 +1236,7 @@
        mkdir -p $MNTIMAGE/etc/udev
        mkdir -p $MNTIMAGE/sys
 
-       if [ -x /sbin/initrd-udev ]; then
-               inst /sbin/initrd-udev $MNTIMAGE/sbin/udev
-               ln -sf udev $MNTIMAGE/sbin/udevd
-       else
-               inst /sbin/initrd-udevd $MNTIMAGE/sbin/udevd
-       fi
+       inst /sbin/initrd-udevd $MNTIMAGE/sbin/udevd
        inst /etc/udev/udev.conf $MNTIMAGE/etc/udev/udev.conf
 
        if is_yes "$USE_UDEV"; then