File 0010-network-start-fails-under-systemd.test.patch of Package sysconfig.openSUSE_12.1_Update
From 4ee376fb64ac023cdaa6c78f4c1768e4f0986414 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Wed, 15 Feb 2012 18:50:14 +0100
Subject: [PATCH 1/3] Use all args in scripts/extradebug file names
Signed-off-by: Marius Tomaschewski <mt@suse.com>
---
scripts/extradebug | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/scripts/extradebug b/scripts/extradebug
index 9a05933..2997a68 100755
--- a/scripts/extradebug
+++ b/scripts/extradebug
@@ -9,7 +9,8 @@ SCRIPT=${0##*/}
{ set +vx ; . /etc/sysconfig/network/scripts/functions.common ; } >&2
test -d $RUN_FILES_BASE && dir=$RUN_FILES_BASE || dir=/
-exec 2> $dir/exdeb.${SCRIPT}_$$.$PPID.${SEQNUM}_$1.$2
+args="" ; for arg in "$@" ; do args="$args.$arg" ; done
+exec 2> "$dir/exdeb.${SCRIPT}_$$.$PPID.${SEQNUM}_${args}"
date +"%F %T.%N" >&2
echo -------------------------------------------------- >&2
--
1.7.7
From ee9d2a28663852349bbf8a1eb315bba796f56b35 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Wed, 15 Feb 2012 18:51:45 +0100
Subject: [PATCH 2/3] Always enable boot-wait mode under systemd
Signed-off-by: Marius Tomaschewski <mt@suse.com>
---
scripts/network | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/scripts/network b/scripts/network
index 77c3b3b..7ccb6ce 100755
--- a/scripts/network
+++ b/scripts/network
@@ -74,6 +74,9 @@ FS_FILTER=""
SD_RUNNING=no
SD_BOOTING=no
if systemd_running ; then
+ # systemd never calls status action,
+ # so always enable boot-wait mode ...
+ MODE=onboot
SD_RUNNING=yes
systemd_booting && SD_BOOTING=yes
fi
--
1.7.7
From e52f94ed16596cb123ea7801ceb849c30e483447 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Wed, 15 Feb 2012 18:50:58 +0100
Subject: [PATCH 3/3] Include PID in log messages
Signed-off-by: Marius Tomaschewski <mt@suse.com>
---
scripts/functions.common | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/functions.common b/scripts/functions.common
index 8542eb7..0b153ce 100644
--- a/scripts/functions.common
+++ b/scripts/functions.common
@@ -135,11 +135,11 @@ if [ "$USE_SYSLOG" != yes ] ; then
else
mesg() {
echo -e "$@" # >&2
- echo -e "$@" | logger -t "$SCRIPTNAME"
+ echo -e "$@" | logger -t "$SCRIPTNAME[$$]"
}
mesg_n() {
echo -ne "$@" # >&2
- echo -e "$@" | logger -t "$SCRIPTNAME"
+ echo -e "$@" | logger -t "$SCRIPTNAME[$$]"
}
fi
@@ -166,10 +166,10 @@ for level in err "#" "#" info debug; do
else
eval ${level}_mesg\(\) \{ echo -e \"\$\@\" 1\>\&2\; \
echo -e \"\$\@\" \
- \| logger -p $nl -t \"$SCRIPTNAME\" \; \}
+ \| logger -p $nl -t \"$SCRIPTNAME[\$\$]\" \; \}
eval ${level}_mesg_n\(\) \{ echo -ne \"\$\@\" 1\>\&2\; \
echo -e \"\$\@\" \
- \| logger -p $nl -t \"$SCRIPTNAME\" \; \}
+ \| logger -p $nl -t \"$SCRIPTNAME[\$\$]\" \; \}
fi
: $((nl++))
done
--
1.7.7
