From a9de431480ab5892f5c5fd42602dc3cbcd815640 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Fri, 27 Oct 2017 17:11:05 +0000 Subject: Update rule in 83-cdrom-symlinks.rules in udev-lfs tarball git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11318 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 10 ++++++++++ general.ent | 4 ++-- packages.ent | 4 ++-- udev-lfs/83-cdrom-symlinks.rules | 2 +- udev-lfs/ChangeLog | 3 +++ 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index d2ed1166b..a74de1b80 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -42,6 +42,16 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2017-10-27 + + + [bdubbs] - Update rule in 83-cdrom-symlinks.rules + in udev-lfs tarball. + + + + 2017-10-20 diff --git a/general.ent b/general.ent index 372425269..90d1f5c51 100644 --- a/general.ent +++ b/general.ent @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/packages.ent b/packages.ent index 98c10c052..cd4ee9ac1 100644 --- a/packages.ent +++ b/packages.ent @@ -647,10 +647,10 @@ - + - + diff --git a/udev-lfs/83-cdrom-symlinks.rules b/udev-lfs/83-cdrom-symlinks.rules index 5d6b60078..1a21a0649 100644 --- a/udev-lfs/83-cdrom-symlinks.rules +++ b/udev-lfs/83-cdrom-symlinks.rules @@ -6,7 +6,7 @@ ENV{GENERATED}=="?*", GOTO="cd_aliases_generator_end" # Fail the uevent if the autogenerated rules cannot be saved ENV{ID_CDROM}=="?*", PROGRAM="/bin/grep -c ' / [^[:space:]]* rw' /proc/mounts", \ - RESULT!="2", RUN+="/bin/false", GOTO="cd_aliases_generator_end" + RESULT!="1", RUN+="/bin/false", GOTO="cd_aliases_generator_end" ENV{ID_CDROM}=="?*", PROGRAM="write_cd_rules", SYMLINK+="%c" diff --git a/udev-lfs/ChangeLog b/udev-lfs/ChangeLog index 9a854b302..2383a6f81 100644 --- a/udev-lfs/ChangeLog +++ b/udev-lfs/ChangeLog @@ -1,3 +1,6 @@ +2017-10-27 + * 83-cdrom-symlinks.rules: Adjust test for writable root directory. + 2014-03-02 * Makefile.lfs: Remove build procedures leaving only LFS rules -- cgit v1.2.3-54-g00ecf