udev: disable new netdev names and systemd log prefix.

diff --git a/lfs/udev b/lfs/udev
index 29912100903d98b2fd8299772fc8267b43827c41..d0349936a18e58bcf1b8c9d6d8038dedf3c2d8dc 100644 (file)
--- a/lfs/udev
+++ b/lfs/udev
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(VER)-1.tar.bz2
 
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208_remove_systemd_log.patch
 #      cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-141_no_netif_rename.patch
 
        cd $(DIR_APP)/udev-lfs-$(VER)-1 && sed -i "s/HANDLE_AT 1/HANDLE_AT 0/g" cfg.h
@@ -82,14 +83,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        rm -rf /lib/udev/devices
        install -dv /lib/firmware
 
-#      install -dv /lib/{firmware,udev/devices/{pts,shm}}
-#      mknod -m0666 /lib/udev/devices/null c 1 3
-#      ln -sv /proc/self/fd /lib/udev/devices/fd
-#      ln -sv /proc/self/fd/0 /lib/udev/devices/stdin
-#      ln -sv /proc/self/fd/1 /lib/udev/devices/stdout
-#      ln -sv /proc/self/fd/2 /lib/udev/devices/stderr
-#      ln -sv /proc/kcore /lib/udev/devices/core
-
        cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs $(MAKETUNING)
        cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs install
 
@@ -99,6 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        # Disable net generator rule. This does not work with the setup.
        rm -f /lib/udev/rules.d/75-persistent-net-generator.rules
+       rm -f /lib/udev/rules.d/80-net-name-slot.rules
 
        # Create rule file for the setup
        touch /etc/udev/rules.d/30-persistent-network.rules

diff --git a/src/patches/udev-208_remove_systemd_log.patch b/src/patches/udev-208_remove_systemd_log.patch
new file mode 100644 (file)
index 0000000..927de1e
--- /dev/null
+++ b/src/patches/udev-208_remove_systemd_log.patch
@@ -0,0 +1,12 @@
+diff -Naur systemd-208.org/src/libudev/libudev-util.c systemd-208/src/libudev/libudev-util.c
+--- systemd-208.org/src/libudev/libudev-util.c 2013-09-23 21:31:55.000000000 +0200
++++ systemd-208/src/libudev/libudev-util.c     2013-11-19 23:18:10.326350131 +0100
+@@ -481,7 +481,7 @@
+         if (fd < 0)
+                 return -errno;
+ 
+-        len = snprintf(text, sizeof(text), "<30>systemd-udevd[%u]: ", getpid());
++        len = snprintf(text, sizeof(text), "udevd[%u]: ", getpid());
+ 
+         va_start(ap, fmt);
+         len += vsnprintf(text + len, sizeof(text) - len, fmt, ap);