From d004707e00201a218983534d2b183168424bd994 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 14 Aug 2010 20:05:54 +0200 Subject: [PATCH] Fix udev rules for udev 1.25. --- lfs/udev | 2 +- src/paks/nut/install.sh | 2 -- .../udev-config-6.2_persistent-storage-fix.patch | 12 ++++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 src/patches/udev-config-6.2_persistent-storage-fix.patch diff --git a/lfs/udev b/lfs/udev index 77d7ae546b..af00187ec8 100644 --- a/lfs/udev +++ b/lfs/udev @@ -76,7 +76,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-125-netif_rename.patch ifeq "$(LFS_PASS)" "install" cd $(DIR_APP) && make DESTDIR=/install/initrd sbindir=/sbin udevdir=/dev cd $(DIR_APP) && make DESTDIR=/install/initrd sbindir=/sbin udevdir=/dev install @@ -106,6 +105,7 @@ ifeq "$(LFS_PASS)" "install" else rm -rf /lib/udev/devices cd $(DIR_APP) && tar jxf $(DIR_DL)/udev-config-6.2.tar.bz2 + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/udev-config-6.2_persistent-storage-fix.patch install -dv /lib/{firmware,udev/devices/{pts,shm}} echo "Put device firmwares here ..." > /lib/firmware/dirinfo mknod -m0666 /lib/udev/devices/null c 1 3 diff --git a/src/paks/nut/install.sh b/src/paks/nut/install.sh index d117ad88fc..7b9fe15e60 100644 --- a/src/paks/nut/install.sh +++ b/src/paks/nut/install.sh @@ -26,8 +26,6 @@ extract_files restore_backup ${NAME} -groupadd nut - ln -svf ../init.d/nut /etc/rc.d/rc0.d/K20nut ln -svf ../init.d/nut /etc/rc.d/rc3.d/S20nut ln -svf ../init.d/nut /etc/rc.d/rc6.d/K20nut diff --git a/src/patches/udev-config-6.2_persistent-storage-fix.patch b/src/patches/udev-config-6.2_persistent-storage-fix.patch new file mode 100644 index 0000000000..172091a4db --- /dev/null +++ b/src/patches/udev-config-6.2_persistent-storage-fix.patch @@ -0,0 +1,12 @@ +diff -Naur udev-config-6.2.org/60-persistent-storage.rules udev-config-6.2/60-persistent-storage.rules +--- udev-config-6.2.org/60-persistent-storage.rules 2006-05-13 01:03:13.000000000 +0200 ++++ udev-config-6.2/60-persistent-storage.rules 2010-08-14 11:08:35.000000000 +0200 +@@ -9,7 +9,7 @@ + + # never access removable ide devices, the drivers are causing event loops on open() + KERNEL=="hd*[!0-9]", SYSFS{removable}=="1", DRIVER=="ide-cs|ide-floppy", GOTO="persistent_storage_end" +-KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_storage_end" ++KERNEL=="hd*[0-9]", SYSFS{removable}=="1", GOTO="persistent_storage_end" + + # for partitions import parent information + KERNEL=="*[0-9]", IMPORT{parent}=="ID_*" -- 2.39.2