rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 333474 from home:jengelh:d2

Browse Source 
- Avoid "file not found /etc/udev/rules.d/70-persistent-net.rules"

OBS-URL: https://build.opensuse.org/request/show/333474
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=904
This commit is contained in:
Dr. Werner Fink 2015-09-25 14:20:16 +00:00 committed by Git OBS Bridge
parent e2327986a6
commit 6bda2878e3
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
systemd-mini.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 23 14:19:32 UTC 2015 - jengelh@inai.de
- Avoid "file not found /etc/udev/rules.d/70-persistent-net.rules"
waring occurring in %post
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 23 12:41:19 UTC 2015 - werner@suse.de Wed Sep 23 12:41:19 UTC 2015 - werner@suse.de

8
systemd-mini.spec
View File

@ -1021,9 +1021,11 @@ fi
%post -n udev%{?mini} %post -n udev%{?mini}
/usr/bin/udevadm hwdb --update || : /usr/bin/udevadm hwdb --update || :
# add KERNEL name match to existing persistent net rules if [ -f /etc/udev/rules.d/70-persistent-net.rules ]; then
sed -ri '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \ # add KERNEL name match to existing persistent net rules
/etc/udev/rules.d/70-persistent-net.rules || : sed -ri '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
/etc/udev/rules.d/70-persistent-net.rules || :
fi
# cleanup old stuff # cleanup old stuff
rm -f /etc/sysconfig/udev rm -f /etc/sysconfig/udev
rm -f /etc/udev/rules.d/20-cdrom.rules rm -f /etc/udev/rules.d/20-cdrom.rules

6
systemd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 23 14:19:32 UTC 2015 - jengelh@inai.de
- Avoid "file not found /etc/udev/rules.d/70-persistent-net.rules"
waring occurring in %post
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 23 12:41:19 UTC 2015 - werner@suse.de Wed Sep 23 12:41:19 UTC 2015 - werner@suse.de

8
systemd.spec
View File

@ -1016,9 +1016,11 @@ fi
%post -n udev%{?mini} %post -n udev%{?mini}
/usr/bin/udevadm hwdb --update || : /usr/bin/udevadm hwdb --update || :
# add KERNEL name match to existing persistent net rules if [ -f /etc/udev/rules.d/70-persistent-net.rules ]; then
sed -ri '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \ # add KERNEL name match to existing persistent net rules
/etc/udev/rules.d/70-persistent-net.rules || : sed -ri '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
/etc/udev/rules.d/70-persistent-net.rules || :
fi
# cleanup old stuff # cleanup old stuff
rm -f /etc/sysconfig/udev rm -f /etc/sysconfig/udev
rm -f /etc/udev/rules.d/20-cdrom.rules rm -f /etc/udev/rules.d/20-cdrom.rules