mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-31 16:21:11 +03:00
rule_generator: fix netif NAME= value extraction regex
$ sed -n -r \ -e 's/^#.*//' \ -e 's/[[:space:],]NAME="(eth[0-9]*)"[[:space:]]*(,.*|\\|)$/\1/p' \ /dev/null /etc/udev/rules.d/70-persistent-net.rules SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:16:41:e2:8d:c7", ATTR{type}=="1", KERNEL=="eth*",eth4 $ sed -n -r \ -e 's/^#.*//' \ -e 's/.*[[:space:],]NAME="(eth[0-9]*)".*/\1/p' \ /dev/null /etc/udev/rules.d/70-persistent-net.rules eth4
This commit is contained in:
parent
84629ccd85
commit
9bdca442ef
@ -92,8 +92,7 @@ find_all_rules() {
|
||||
local linkre="$2"
|
||||
local match="$3"
|
||||
|
||||
local search='[[:space:],]'"$key"'"('"$linkre"')"[[:space:]]*(,.*|\\|)$'
|
||||
|
||||
local search='.*[[:space:],]'"$key"'"('"$linkre"')".*'
|
||||
echo $(sed -n -r -e 's/^#.*//' -e "${match}s/${search}/\1/p" \
|
||||
$RO_RULES_FILE \
|
||||
$([ -e $RULES_FILE ] && echo $RULES_FILE) \
|
||||
|
@ -11,6 +11,13 @@
|
||||
# under the terms of the GNU General Public License as published by the
|
||||
# Free Software Foundation version 2 of the License.
|
||||
|
||||
# debug, if UDEV_LOG=<debug>
|
||||
if [ -n "$UDEV_LOG" ]; then
|
||||
if [ "$UDEV_LOG" -ge 7 ]; then
|
||||
set -x
|
||||
fi
|
||||
fi
|
||||
|
||||
RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules"
|
||||
|
||||
. /lib/udev/rule_generator.functions
|
||||
@ -28,10 +35,10 @@ write_rule() {
|
||||
if [ "$PRINT_HEADER" ]; then
|
||||
PRINT_HEADER=
|
||||
echo "# This file was automatically generated by the $0"
|
||||
echo "# program, probably run by the cd-aliases-generator.rules rules file."
|
||||
echo "# program, run by the cd-aliases-generator.rules rules file."
|
||||
echo "#"
|
||||
echo "# You can modify it, as long as you keep each rule on a single line"
|
||||
echo "# and set the \$GENERATED variable."
|
||||
echo "# You can modify it, as long as you keep each rule on a single"
|
||||
echo "# line, and set the \$GENERATED variable."
|
||||
echo ""
|
||||
fi
|
||||
|
||||
|
@ -22,6 +22,13 @@
|
||||
# INTERFACE_NAME requested name supplied by external tool
|
||||
# INTERFACE_NEW new interface name returned by rule writer
|
||||
|
||||
# debug, if UDEV_LOG=<debug>
|
||||
if [ -n "$UDEV_LOG" ]; then
|
||||
if [ "$UDEV_LOG" -ge 7 ]; then
|
||||
set -x
|
||||
fi
|
||||
fi
|
||||
|
||||
RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
|
||||
|
||||
. /lib/udev/rule_generator.functions
|
||||
@ -48,9 +55,10 @@ write_rule() {
|
||||
if [ "$PRINT_HEADER" ]; then
|
||||
PRINT_HEADER=
|
||||
echo "# This file was automatically generated by the $0"
|
||||
echo "# program run by the persistent-net-generator.rules rules file."
|
||||
echo "# program, run by the persistent-net-generator.rules rules file."
|
||||
echo "#"
|
||||
echo "# You can modify it, as long as you keep each rule on a single line."
|
||||
echo "# You can modify it, as long as you keep each rule on a single"
|
||||
echo "# line, and change only the value of the NAME= key."
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
Loading…
Reference in New Issue
Block a user