From 166750a6697967a141ba46786b3cc15b847b248dfc5a5112aab8c292966c9b4f Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 19 Nov 2014 09:32:26 +0000 Subject: [PATCH] Accepting request 262257 from home:Ledest:bashisms fix bashisms in write_net_rules script OBS-URL: https://build.opensuse.org/request/show/262257 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=819 --- 1053-better-checks-in-write_net_rules.patch | 4 ++-- systemd.changes | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/1053-better-checks-in-write_net_rules.patch b/1053-better-checks-in-write_net_rules.patch index 50e03693..5fa8076d 100644 --- a/1053-better-checks-in-write_net_rules.patch +++ b/1053-better-checks-in-write_net_rules.patch @@ -8,7 +8,7 @@ Index: systemd-210/src/udev/rule_generator/write_net_rules if [ "$MATCHADDR" ]; then + # Check if MACADDR doesn't exist already in the generated rules + MAC="$(/usr/bin/grep -w -o -C1 -m1 "$MATCHADDR" "$RULES_FILE" 2>/dev/null || true)" -+ if [ "$MAC" == "$MATCHADDR" ]; then ++ if [ "$MAC" = "$MATCHADDR" ]; then + unlock_rules_file + exit 0 + fi @@ -23,7 +23,7 @@ Index: systemd-210/src/udev/rule_generator/write_net_rules - if [ "$ID" == "$MATCHID" ]; then + # Check if KERNEL doesn't exist already in the generated rules + KERNEL="$(find_all_rules 'KERNELS==' "$MATCHID")" -+ if [ "$KERNEL" == "$MATCHID" ]; then ++ if [ "$KERNEL" = "$MATCHID" ]; then unlock_rules_file exit 0 fi diff --git a/systemd.changes b/systemd.changes index 3c7abde2..bda7aa30 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 19 00:58:00 UTC 2014 - Led + +- fix bashisms in write_net_rules script +- update patches: + * 1053-better-checks-in-write_net_rules.patch + ------------------------------------------------------------------- Tue Nov 18 10:26:08 UTC 2014 - werner@suse.de