[arch-general] [PATCH 39/48] Flatten adding persistent rules.

[Thomas Bächler]

Am 30.06.2010 23:47, schrieb Victor Lowther:
> ---
>  rc.sysinit |   16 ++++++----------
>  1 files changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/rc.sysinit b/rc.sysinit
> index c6ed35f..ac32fca 100755
> --- a/rc.sysinit
> +++ b/rc.sysinit
> @@ -342,16 +342,12 @@ fi
>  set_consolefont
>  
>  # Adding persistent network/cdrom generated rules
> -if [ -f "/dev/.udev/tmp-rules--70-persistent-cd.rules" ]; then
> -	stat_busy "Adding persistent cdrom udev rules"
> -	/bin/cat /dev/.udev/tmp-rules--70-persistent-cd.rules >> /etc/udev/rules.d/70-persistent-cd.rules
> -	stat_done
> -fi
> -if [ -f "/dev/.udev/tmp-rules--70-persistent-net.rules" ]; then
> -	stat_busy "Adding persistent network udev rules"
> -	/bin/cat /dev/.udev/tmp-rules--70-persistent-net.rules >> /etc/udev/rules.d/70-persistent-net.rules
> -	stat_done
> -fi
> +for f in cd net; do
> +    [[ -f /dev/.udev/tmp-rules--70-persistent-$f.rules ]] || continue
> +    stat_busy "Adding persistent $f udev rules"
> +    /bin/cat "/dev/.udev/tmp-rules--70-persistent-$f.rules" >> "/etc/udev/rules.d/70-persistent-$f.rules"
> +    stat_done
> +done
>  
>  /bin/dmesg >| /var/log/dmesg.log
>  

ACKed

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <http://mailman.archlinux.org/pipermail/arch-general/attachments/20100716/bff105f0/attachment.bin>