[rhel7-branch 5/5] dracut: minor cleanup

wgwoods installerbot-noreply at redhat.com
Wed Jul 22 21:55:43 UTC 2015


From: Will Woods <wwoods at redhat.com>

anaconda-lib has the `when_any_cdrom_appears` function for this exact
purpose, so use that instead of handcrafting the udev rule.

Related: rhbz#1168902

(cherry picked from commit fdee9c29ff58b60f799d93565db8f9a0d6cec45f)
---
 dracut/repo-genrules.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dracut/repo-genrules.sh b/dracut/repo-genrules.sh
index 55abd32..9f1d40e 100755
--- a/dracut/repo-genrules.sh
+++ b/dracut/repo-genrules.sh
@@ -14,9 +14,8 @@ case "$root" in
   ;;
   anaconda-auto-cd)
     # special catch-all rule for CDROMs
-    echo 'ENV{ID_CDROM}=="1",' \
-           'RUN+="/sbin/initqueue --settled --onetime' \
-             '/sbin/anaconda-diskroot $env{DEVNAME}"' >> $rulesfile
+    when_any_cdrom_appears \
+        anaconda-diskroot \$env{DEVNAME}
     # HACK: anaconda demands that CDROMs be mounted at /mnt/install/source
     ln -s repo /run/install/source
   ;;


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/b4c6368781f51d14aa92d8308025d199701d6d9c


More information about the anaconda-patches mailing list