Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 437700 | Differences between
and this patch

Collapse All | Expand All

(-)dracut-024.orig/modules.d/95udev-rules/59-persistent-storage.rules (-4 / +9 lines)
Lines 3-10 Link Here
3 
# Also don't process disks that are slated to be a multipath device
 3 
# Also don't process disks that are slated to be a multipath device
4 
ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="ps_end"
 4 
ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="ps_end"
5 

          5
          

        

          
            

              6
              
KERNEL=="cciss[0-9]*", IMPORT{builtin}="blkid"


              6
              
IMPORT{program}="builtins-check.sh"

            

            

              7
              
KERNEL=="nbd[0-9]*", IMPORT{builtin}="blkid"


              7
              
ENV{BLKID_BUILTIN}=="1", KERNEL=="cciss[0-9]*", IMPORT{builtin}="blkid"

            

            

              
              

              8
              
ENV{BLKID_BUILTIN}=="1", KERNEL=="nbd[0-9]*", IMPORT{builtin}="blkid"

            

            


              9
              
ENV{BLKID_BUILTIN}=="0", KERNEL=="cciss[0-9]*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode"

            

            


              10
              
ENV{BLKID_BUILTIN}=="0", KERNEL=="nbd[0-9]*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode"

            

        

          8
          

          11
          

        

        

          9
          

          12
          

        

        

          10
          
KERNEL!="md[0-9]*|md_d[0-9]*|md/*", KERNEL!="md*", GOTO="md_end"

          13
          
KERNEL!="md[0-9]*|md_d[0-9]*|md/*", KERNEL!="md*", GOTO="md_end"

        

  

    
      
            Lines 21-27
          
      
      
        Link Here
      
    
  

        

          21
          
LABEL="md_ignore_state"

          24
          
LABEL="md_ignore_state"

        

        

          22
          

          25
          

        

        

          23
          
IMPORT{program}="/sbin/mdadm --detail --export $tempnode"

          26
          
IMPORT{program}="/sbin/mdadm --detail --export $tempnode"

        

          
            

              24
              
IMPORT{builtin}="blkid"


              27
              
ENV{BLKID_BUILTIN}=="1", IMPORT{builtin}="blkid"

            

            

              
              

              28
              
ENV{BLKID_BUILTIN}=="0", IMPORT{program}="/sbin/blkid -o udev -p $tempnode"

            

        

          25
          
OPTIONS+="link_priority=100"

          29
          
OPTIONS+="link_priority=100"

        

        

          26
          
OPTIONS+="watch"

          30
          
OPTIONS+="watch"

        

        

          27
          
LABEL="md_end"

          31
          
LABEL="md_end"

        

  

    
      
            Lines 34-40
          
      
      
        Link Here
      
    
  

        

          34
          
ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="ps_end"

          38
          
ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="ps_end"

        

        

          35
          
ENV{DM_UUID}=="CRYPT-TEMP-?*", GOTO="ps_end"

          39
          
ENV{DM_UUID}=="CRYPT-TEMP-?*", GOTO="ps_end"

        

        

          36
          
ENV{DM_UUID}!="?*", ENV{DM_NAME}=="temporary-cryptsetup-?*", GOTO="ps_end"

          40
          
ENV{DM_UUID}!="?*", ENV{DM_NAME}=="temporary-cryptsetup-?*", GOTO="ps_end"

        

          
            

              37
              
IMPORT{builtin}="blkid"


              41
              
ENV{BLKID_BUILTIN}=="1", IMPORT{builtin}="blkid"

            

            

              
              

              42
              
ENV{BLKID_BUILTIN}=="0", IMPORT{program}="/sbin/blkid -o udev -p $tempnode"

            

        

          38
          

          43
          

        

        

          39
          

          44
          

        

        

          40
          
LABEL="ps_end"

          45
          
LABEL="ps_end"

        



(-)dracut-024.orig/modules.d/95udev-rules/61-persistent-storage.rules
      (-1 / +3 lines)




  

    
      
            Lines 12-18
          
      
      
        Link Here
      
    
  

        

          12
          

          12
          

        

        

          13
          
LABEL="do_pss"

          13
          
LABEL="do_pss"

        

        

          14
          
# by-path (parent device path)

          14
          
# by-path (parent device path)

        

          
            

              15
              
ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="", DEVPATH!="*/virtual/*", IMPORT{builtin}="path_id"


              15
              
IMPORT{program}="builtins-check.sh"

            

            

              
              

              16
              
ENV{PATH_ID_BUILTIN}=="1", ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="", DEVPATH!="*/virtual/*", IMPORT{builtin}="path_id"

            

            


              17
              
ENV{PATH_ID_BUILTIN}=="0", ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="", DEVPATH!="*/virtual/*", IMPORT{program}="path_id %p"

            

        

          16
          
ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}"

          18
          
ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}"

        

        

          17
          
ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"

          19
          
ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"

        

        

          18
          

          20
          

        



(-)dracut-024.orig/modules.d/95udev-rules/builtins-check.sh
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
#!/bin/sh

            

            

              2
              

            

            

              3
              
UDEVVERSION=$(/sbin/udevadm --version)

            

            

              4
              

            

            

              5
              
[ $UDEVVERSION -ge 174 ] \

            

            

              6
              
    && echo 'PATH_ID_BUILTIN=1' \

            

            

              7
              
    || echo 'PATH_ID_BUILTIN=0'

            

            

              8
              

            

            

              9
              
[ $UDEVVERSION -ge 176 ] \

            

            

              10
              
    && echo 'BLKID_BUILTIN=1' \

            

            

              11
              
    || echo 'BLKID_BUILTIN=0'

            



(-)dracut-024.orig/modules.d/95udev-rules/module-setup.sh
      (+2 lines)




  

    
      
            Lines 73-78
          
      
      
        Link Here
      
    
  

        

          73
          
    [ -f /etc/arch-release ] && \

          73
          
    [ -f /etc/arch-release ] && \

        

        

          74
          
        inst_script "$moddir/load-modules.sh" /lib/udev/load-modules.sh

          74
          
        inst_script "$moddir/load-modules.sh" /lib/udev/load-modules.sh

        

        

          75
          

          75
          

        

            

              
              
              76
              
    inst_script "$moddir/builtins-check.sh" ${udevdir}/builtins-check.sh

            

            

              77
              

            

        

          76
          
    inst_libdir_file "libnss_files*"

          78
          
    inst_libdir_file "libnss_files*"

        

        

          77
          
}

          79
          
}

        

        

          78
          

          80
          

        






  

  Return to bug 437700