* [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/
@ 2017-02-04 21:22 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2017-02-04 21:22 UTC (permalink / raw
To: gentoo-commits
commit: 6fa626fb44b999b331cfc1dbbfd1b40f1cc8f16c
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Feb 4 17:39:57 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 21:21:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fa626fb
sys-apps/openrc: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3809
sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch | 57 ---------------
.../files/openrc-0.8.3-deprecation_warning.patch | 33 ---------
sys-apps/openrc/files/openrc-9999-msg-style.patch | 81 ----------------------
sys-apps/openrc/files/openrc-9999-pause.patch | 29 --------
4 files changed, 200 deletions(-)
diff --git a/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch b/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch
deleted file mode 100644
index 14ecd5f..00000000
--- a/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From c427d3c1fec89f6a9281dccdc123bad73af80804 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 28 Jun 2011 00:02:11 -0400
-Subject: [PATCH] net: ccwgroup: smooth up/down process
-
-We need to bring the link up ourselves after we've properly configured
-the device. The common code tries to bring the link up itself, but it
-does so before things are configured, and so it ends up failing.
-
-When shutting down, we need to wait for the kernel to finish destroying
-the interface. Otherwise, when doing a restart, openrc is quick enough
-to tell the kernel to destroy things, but then start trying to bring it
-back up before the kernel has finished.
-
-X-Gentoo-Bug: 367467
-X-Gentoo-Bug-URL: http://bugs.gentoo.org/367467
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- net/ccwgroup.sh | 14 ++++++++++++--
- 1 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/net/ccwgroup.sh b/net/ccwgroup.sh
-index 248b159..60cd25f 100644
---- a/net/ccwgroup.sh
-+++ b/net/ccwgroup.sh
-@@ -58,6 +58,11 @@ ccwgroup_pre_start()
- echo "${val}" > /sys/devices/${ccw_type}/${first}/${var}
- done
- eend $?
-+
-+ # Now that we've properly configured the device, we can run
-+ # bring the interface up. Common code tried to do this already,
-+ # but it failed because we didn't setup sysfs yet.
-+ _up
- }
-
- ccwgroup_pre_stop()
-@@ -88,9 +93,14 @@ ccwgroup_post_stop()
- local device="$(service_get_value ccwgroup_device)"
- [ -z "${device}" ] && return 0
- local ccw_type="$(service_get_value ccwgroup_type)"
-+ local path="/sys/devices/${ccw_type}/${device}"
-
- einfo "Disabling ccwgroup/${ccw_type} on ${IFACE}"
-- echo "0" >/sys/devices/${ccw_type}/"${device}"/online
-- echo "1" >/sys/devices/${ccw_type}/"${device}"/ungroup
-+ if echo "0" >"${path}"/online &&
-+ echo "1" >"${path}"/ungroup ; then
-+ # The device doesn't disappear right away which breaks
-+ # restart, or a quick start up, so wait around.
-+ while [ -e "${path}" ] ; do :; done
-+ fi
- eend $?
- }
---
-1.7.5.3
-
diff --git a/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch b/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch
deleted file mode 100644
index 1aa7315..00000000
--- a/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 24ba7955634dd571a4c34dd712dc8a592eea4d73 Mon Sep 17 00:00:00 2001
-From: Joe Harvell <jharvell@dogpad.net>
-Date: Mon, 27 Jun 2011 23:20:47 +0200
-Subject: [PATCH] Only print the deprecation warning for --chuid/-c when using it
-
-The deprecation warning has been printed when using the replecement functions as
-well, bug 373243.
----
- src/rc/start-stop-daemon.c | 5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c
-index b5c2b6e..3017701 100644
---- a/src/rc/start-stop-daemon.c
-+++ b/src/rc/start-stop-daemon.c
-@@ -788,12 +788,11 @@ start_stop_daemon(int argc, char **argv)
- background = true;
- break;
-
-- case 'u': /* --user <username>|<uid> */
- case 'c': /* --chuid <username>|<uid> */
-- {
- /* DEPRECATED */
- ewarn("WARNING: -c/--chuid is deprecated and will be removed in the future, please use -u/--user instead");
--
-+ case 'u': /* --user <username>|<uid> */
-+ {
- p = optarg;
- tmp = strsep(&p, ":");
- changeuser = xstrdup(tmp);
---
-1.7.3.4
-
diff --git a/sys-apps/openrc/files/openrc-9999-msg-style.patch b/sys-apps/openrc/files/openrc-9999-msg-style.patch
deleted file mode 100644
index ac325bb..00000000
--- a/sys-apps/openrc/files/openrc-9999-msg-style.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 1e307244138c8f650ab37bffa7b3cc3e3b39cd64 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 24 Mar 2008 01:48:19 -0400
-Subject: [PATCH] restore old e* func output
-
-Gentoo has always used the sytle:
- * moo ... [ ok ]
-Latest openrc now does:
-* moo... [ok]
-
-Realistically, 4 spaces out of 80 on reduced terminals doesn't make any
-sort of realistic difference and it's been just fine for the last 10
-years, so keep the default behavior.
----
- src/libeinfo/libeinfo.c | 15 ++++++---------
- 1 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
-index 8a7613c..234b1af 100644
---- a/src/libeinfo/libeinfo.c
-+++ b/src/libeinfo/libeinfo.c
-@@ -643,7 +643,7 @@ static int EINFO_PRINTF(3, 0)
- fprintf(f, "\n");
- if (_eprefix)
- fprintf(f, "%s%s%s|", _ecolor(f, color), _eprefix, _ecolor(f, ECOLOR_NORMAL));
-- fprintf(f, "%s*%s ", _ecolor(f, color), _ecolor(f, ECOLOR_NORMAL));
-+ fprintf(f, " %s*%s ", _ecolor(f, color), _ecolor(f, ECOLOR_NORMAL));
- retval += _eindent(f);
- va_copy(ap, va);
- retval += vfprintf(f, fmt, ap) + 3;
-@@ -800,7 +800,7 @@ ebegin(const char *EINFO_RESTRICT fmt, ...)
- va_start(ap, fmt);
- retval = _einfovn(fmt, ap);
- va_end(ap);
-- retval += printf("...");
-+ retval += printf(" ...");
- if (colour_terminal(stdout))
- retval += printf("\n");
- LASTCMD("ebegin");
-@@ -817,7 +817,7 @@ _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
- if (!msg)
- return;
-
-- cols = get_term_columns(fp) - (strlen(msg) + 3);
-+ cols = get_term_columns(fp) - (strlen(msg) + 5);
-
- /* cons25 is special - we need to remove one char, otherwise things
- * do not align properly at all. */
-@@ -831,18 +831,15 @@ _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
- if (term_is_cons25)
- cols--;
-
-- /* If extra spacing is required around msg, then please change
-- * via a runtime knob and leave this default as is as it saves 2
-- * valuable columns when running on 80 column screens. */
- if (cols > 0 && colour_terminal(fp)) {
-- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols),
-+ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols),
- ecolor(ECOLOR_BRACKET), ecolor(color), msg,
- ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL));
- } else {
- if (col > 0)
- for (i = 0; i < cols - col; i++)
- fprintf(fp, " ");
-- fprintf(fp, " [%s]\n", msg);
-+ fprintf(fp, " [ %s ]\n", msg);
- }
- }
-
-@@ -1030,7 +1027,7 @@ ebeginv(const char *EINFO_RESTRICT fmt, ...)
-
- va_start(ap, fmt);
- retval = _einfovn(fmt, ap);
-- retval += printf("...");
-+ retval += printf(" ...");
- if (colour_terminal(stdout))
- retval += printf("\n");
- va_end(ap);
---
-1.6.6.rc3
-
diff --git a/sys-apps/openrc/files/openrc-9999-pause.patch b/sys-apps/openrc/files/openrc-9999-pause.patch
deleted file mode 100644
index bf2c94f..00000000
--- a/sys-apps/openrc/files/openrc-9999-pause.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e82772a6b6d4374e81b7e19a593ffdef16753418 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 21 Dec 2009 09:02:35 -0500
-Subject: [PATCH] restore init.d pause option
-
----
- src/rc/runscript.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/src/rc/runscript.c b/src/rc/runscript.c
-index 5939dae..7147902 100644
---- a/src/rc/runscript.c
-+++ b/src/rc/runscript.c
-@@ -1316,6 +1316,12 @@ runscript(int argc, char **argv)
- prefix = NULL;
- retval = svc_exec("status", NULL);
- } else {
-+ if (strcmp(optarg, "pause") == 0) {
-+ ewarn("WARNING: 'pause' is deprecated; please use '--nodeps stop'");
-+ deps = false;
-+ optarg = "stop";
-+ }
-+
- if (strcmp(optarg, "conditionalrestart") == 0 ||
- strcmp(optarg, "condrestart") == 0)
- {
---
-1.6.6.rc3
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/
@ 2017-02-04 21:48 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2017-02-04 21:48 UTC (permalink / raw
To: gentoo-commits
commit: 16a01fd4426f843f5c0990c87655a40d4abad7d8
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 21:47:33 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 21:47:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16a01fd4
Revert "sys-apps/openrc: remove unused patches"
This reverts commit 6fa626fb44b999b331cfc1dbbfd1b40f1cc8f16c.
sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch | 57 +++++++++++++++
.../files/openrc-0.8.3-deprecation_warning.patch | 33 +++++++++
sys-apps/openrc/files/openrc-9999-msg-style.patch | 81 ++++++++++++++++++++++
sys-apps/openrc/files/openrc-9999-pause.patch | 29 ++++++++
4 files changed, 200 insertions(+)
diff --git a/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch b/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch
new file mode 100644
index 00000000..14ecd5f
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch
@@ -0,0 +1,57 @@
+From c427d3c1fec89f6a9281dccdc123bad73af80804 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 28 Jun 2011 00:02:11 -0400
+Subject: [PATCH] net: ccwgroup: smooth up/down process
+
+We need to bring the link up ourselves after we've properly configured
+the device. The common code tries to bring the link up itself, but it
+does so before things are configured, and so it ends up failing.
+
+When shutting down, we need to wait for the kernel to finish destroying
+the interface. Otherwise, when doing a restart, openrc is quick enough
+to tell the kernel to destroy things, but then start trying to bring it
+back up before the kernel has finished.
+
+X-Gentoo-Bug: 367467
+X-Gentoo-Bug-URL: http://bugs.gentoo.org/367467
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ net/ccwgroup.sh | 14 ++++++++++++--
+ 1 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/net/ccwgroup.sh b/net/ccwgroup.sh
+index 248b159..60cd25f 100644
+--- a/net/ccwgroup.sh
++++ b/net/ccwgroup.sh
+@@ -58,6 +58,11 @@ ccwgroup_pre_start()
+ echo "${val}" > /sys/devices/${ccw_type}/${first}/${var}
+ done
+ eend $?
++
++ # Now that we've properly configured the device, we can run
++ # bring the interface up. Common code tried to do this already,
++ # but it failed because we didn't setup sysfs yet.
++ _up
+ }
+
+ ccwgroup_pre_stop()
+@@ -88,9 +93,14 @@ ccwgroup_post_stop()
+ local device="$(service_get_value ccwgroup_device)"
+ [ -z "${device}" ] && return 0
+ local ccw_type="$(service_get_value ccwgroup_type)"
++ local path="/sys/devices/${ccw_type}/${device}"
+
+ einfo "Disabling ccwgroup/${ccw_type} on ${IFACE}"
+- echo "0" >/sys/devices/${ccw_type}/"${device}"/online
+- echo "1" >/sys/devices/${ccw_type}/"${device}"/ungroup
++ if echo "0" >"${path}"/online &&
++ echo "1" >"${path}"/ungroup ; then
++ # The device doesn't disappear right away which breaks
++ # restart, or a quick start up, so wait around.
++ while [ -e "${path}" ] ; do :; done
++ fi
+ eend $?
+ }
+--
+1.7.5.3
+
diff --git a/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch b/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch
new file mode 100644
index 00000000..1aa7315
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch
@@ -0,0 +1,33 @@
+From 24ba7955634dd571a4c34dd712dc8a592eea4d73 Mon Sep 17 00:00:00 2001
+From: Joe Harvell <jharvell@dogpad.net>
+Date: Mon, 27 Jun 2011 23:20:47 +0200
+Subject: [PATCH] Only print the deprecation warning for --chuid/-c when using it
+
+The deprecation warning has been printed when using the replecement functions as
+well, bug 373243.
+---
+ src/rc/start-stop-daemon.c | 5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c
+index b5c2b6e..3017701 100644
+--- a/src/rc/start-stop-daemon.c
++++ b/src/rc/start-stop-daemon.c
+@@ -788,12 +788,11 @@ start_stop_daemon(int argc, char **argv)
+ background = true;
+ break;
+
+- case 'u': /* --user <username>|<uid> */
+ case 'c': /* --chuid <username>|<uid> */
+- {
+ /* DEPRECATED */
+ ewarn("WARNING: -c/--chuid is deprecated and will be removed in the future, please use -u/--user instead");
+-
++ case 'u': /* --user <username>|<uid> */
++ {
+ p = optarg;
+ tmp = strsep(&p, ":");
+ changeuser = xstrdup(tmp);
+--
+1.7.3.4
+
diff --git a/sys-apps/openrc/files/openrc-9999-msg-style.patch b/sys-apps/openrc/files/openrc-9999-msg-style.patch
new file mode 100644
index 00000000..ac325bb
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-9999-msg-style.patch
@@ -0,0 +1,81 @@
+From 1e307244138c8f650ab37bffa7b3cc3e3b39cd64 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 24 Mar 2008 01:48:19 -0400
+Subject: [PATCH] restore old e* func output
+
+Gentoo has always used the sytle:
+ * moo ... [ ok ]
+Latest openrc now does:
+* moo... [ok]
+
+Realistically, 4 spaces out of 80 on reduced terminals doesn't make any
+sort of realistic difference and it's been just fine for the last 10
+years, so keep the default behavior.
+---
+ src/libeinfo/libeinfo.c | 15 ++++++---------
+ 1 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
+index 8a7613c..234b1af 100644
+--- a/src/libeinfo/libeinfo.c
++++ b/src/libeinfo/libeinfo.c
+@@ -643,7 +643,7 @@ static int EINFO_PRINTF(3, 0)
+ fprintf(f, "\n");
+ if (_eprefix)
+ fprintf(f, "%s%s%s|", _ecolor(f, color), _eprefix, _ecolor(f, ECOLOR_NORMAL));
+- fprintf(f, "%s*%s ", _ecolor(f, color), _ecolor(f, ECOLOR_NORMAL));
++ fprintf(f, " %s*%s ", _ecolor(f, color), _ecolor(f, ECOLOR_NORMAL));
+ retval += _eindent(f);
+ va_copy(ap, va);
+ retval += vfprintf(f, fmt, ap) + 3;
+@@ -800,7 +800,7 @@ ebegin(const char *EINFO_RESTRICT fmt, ...)
+ va_start(ap, fmt);
+ retval = _einfovn(fmt, ap);
+ va_end(ap);
+- retval += printf("...");
++ retval += printf(" ...");
+ if (colour_terminal(stdout))
+ retval += printf("\n");
+ LASTCMD("ebegin");
+@@ -817,7 +817,7 @@ _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
+ if (!msg)
+ return;
+
+- cols = get_term_columns(fp) - (strlen(msg) + 3);
++ cols = get_term_columns(fp) - (strlen(msg) + 5);
+
+ /* cons25 is special - we need to remove one char, otherwise things
+ * do not align properly at all. */
+@@ -831,18 +831,15 @@ _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
+ if (term_is_cons25)
+ cols--;
+
+- /* If extra spacing is required around msg, then please change
+- * via a runtime knob and leave this default as is as it saves 2
+- * valuable columns when running on 80 column screens. */
+ if (cols > 0 && colour_terminal(fp)) {
+- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols),
++ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols),
+ ecolor(ECOLOR_BRACKET), ecolor(color), msg,
+ ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL));
+ } else {
+ if (col > 0)
+ for (i = 0; i < cols - col; i++)
+ fprintf(fp, " ");
+- fprintf(fp, " [%s]\n", msg);
++ fprintf(fp, " [ %s ]\n", msg);
+ }
+ }
+
+@@ -1030,7 +1027,7 @@ ebeginv(const char *EINFO_RESTRICT fmt, ...)
+
+ va_start(ap, fmt);
+ retval = _einfovn(fmt, ap);
+- retval += printf("...");
++ retval += printf(" ...");
+ if (colour_terminal(stdout))
+ retval += printf("\n");
+ va_end(ap);
+--
+1.6.6.rc3
+
diff --git a/sys-apps/openrc/files/openrc-9999-pause.patch b/sys-apps/openrc/files/openrc-9999-pause.patch
new file mode 100644
index 00000000..bf2c94f
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-9999-pause.patch
@@ -0,0 +1,29 @@
+From e82772a6b6d4374e81b7e19a593ffdef16753418 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 21 Dec 2009 09:02:35 -0500
+Subject: [PATCH] restore init.d pause option
+
+---
+ src/rc/runscript.c | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/src/rc/runscript.c b/src/rc/runscript.c
+index 5939dae..7147902 100644
+--- a/src/rc/runscript.c
++++ b/src/rc/runscript.c
+@@ -1316,6 +1316,12 @@ runscript(int argc, char **argv)
+ prefix = NULL;
+ retval = svc_exec("status", NULL);
+ } else {
++ if (strcmp(optarg, "pause") == 0) {
++ ewarn("WARNING: 'pause' is deprecated; please use '--nodeps stop'");
++ deps = false;
++ optarg = "stop";
++ }
++
+ if (strcmp(optarg, "conditionalrestart") == 0 ||
+ strcmp(optarg, "condrestart") == 0)
+ {
+--
+1.6.6.rc3
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/
@ 2017-02-05 16:37 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2017-02-05 16:37 UTC (permalink / raw
To: gentoo-commits
commit: 46d22908c12a935d53749cdfce34a86f2820eb76
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Feb 5 11:41:22 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 5 16:36:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d22908
sys-apps/openrc: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3820
sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch | 57 ----------------------
.../files/openrc-0.8.3-deprecation_warning.patch | 33 -------------
2 files changed, 90 deletions(-)
diff --git a/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch b/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch
deleted file mode 100644
index 14ecd5f..00000000
--- a/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From c427d3c1fec89f6a9281dccdc123bad73af80804 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 28 Jun 2011 00:02:11 -0400
-Subject: [PATCH] net: ccwgroup: smooth up/down process
-
-We need to bring the link up ourselves after we've properly configured
-the device. The common code tries to bring the link up itself, but it
-does so before things are configured, and so it ends up failing.
-
-When shutting down, we need to wait for the kernel to finish destroying
-the interface. Otherwise, when doing a restart, openrc is quick enough
-to tell the kernel to destroy things, but then start trying to bring it
-back up before the kernel has finished.
-
-X-Gentoo-Bug: 367467
-X-Gentoo-Bug-URL: http://bugs.gentoo.org/367467
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- net/ccwgroup.sh | 14 ++++++++++++--
- 1 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/net/ccwgroup.sh b/net/ccwgroup.sh
-index 248b159..60cd25f 100644
---- a/net/ccwgroup.sh
-+++ b/net/ccwgroup.sh
-@@ -58,6 +58,11 @@ ccwgroup_pre_start()
- echo "${val}" > /sys/devices/${ccw_type}/${first}/${var}
- done
- eend $?
-+
-+ # Now that we've properly configured the device, we can run
-+ # bring the interface up. Common code tried to do this already,
-+ # but it failed because we didn't setup sysfs yet.
-+ _up
- }
-
- ccwgroup_pre_stop()
-@@ -88,9 +93,14 @@ ccwgroup_post_stop()
- local device="$(service_get_value ccwgroup_device)"
- [ -z "${device}" ] && return 0
- local ccw_type="$(service_get_value ccwgroup_type)"
-+ local path="/sys/devices/${ccw_type}/${device}"
-
- einfo "Disabling ccwgroup/${ccw_type} on ${IFACE}"
-- echo "0" >/sys/devices/${ccw_type}/"${device}"/online
-- echo "1" >/sys/devices/${ccw_type}/"${device}"/ungroup
-+ if echo "0" >"${path}"/online &&
-+ echo "1" >"${path}"/ungroup ; then
-+ # The device doesn't disappear right away which breaks
-+ # restart, or a quick start up, so wait around.
-+ while [ -e "${path}" ] ; do :; done
-+ fi
- eend $?
- }
---
-1.7.5.3
-
diff --git a/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch b/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch
deleted file mode 100644
index 1aa7315..00000000
--- a/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 24ba7955634dd571a4c34dd712dc8a592eea4d73 Mon Sep 17 00:00:00 2001
-From: Joe Harvell <jharvell@dogpad.net>
-Date: Mon, 27 Jun 2011 23:20:47 +0200
-Subject: [PATCH] Only print the deprecation warning for --chuid/-c when using it
-
-The deprecation warning has been printed when using the replecement functions as
-well, bug 373243.
----
- src/rc/start-stop-daemon.c | 5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c
-index b5c2b6e..3017701 100644
---- a/src/rc/start-stop-daemon.c
-+++ b/src/rc/start-stop-daemon.c
-@@ -788,12 +788,11 @@ start_stop_daemon(int argc, char **argv)
- background = true;
- break;
-
-- case 'u': /* --user <username>|<uid> */
- case 'c': /* --chuid <username>|<uid> */
-- {
- /* DEPRECATED */
- ewarn("WARNING: -c/--chuid is deprecated and will be removed in the future, please use -u/--user instead");
--
-+ case 'u': /* --user <username>|<uid> */
-+ {
- p = optarg;
- tmp = strsep(&p, ":");
- changeuser = xstrdup(tmp);
---
-1.7.3.4
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/
@ 2017-12-20 22:27 William Hubbs
0 siblings, 0 replies; 6+ messages in thread
From: William Hubbs @ 2017-12-20 22:27 UTC (permalink / raw
To: gentoo-commits
commit: 4b5a50929bfa41d4150087af559fd79619c64536
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Nov 17 19:16:40 2017 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 22:25:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b5a5092
sys-apps/openrc: remove unused patches
This closes #6213.
sys-apps/openrc/files/openrc-9999-msg-style.patch | 81 -----------------------
sys-apps/openrc/files/openrc-9999-pause.patch | 29 --------
2 files changed, 110 deletions(-)
diff --git a/sys-apps/openrc/files/openrc-9999-msg-style.patch b/sys-apps/openrc/files/openrc-9999-msg-style.patch
deleted file mode 100644
index ac325bb79bc..00000000000
--- a/sys-apps/openrc/files/openrc-9999-msg-style.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 1e307244138c8f650ab37bffa7b3cc3e3b39cd64 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 24 Mar 2008 01:48:19 -0400
-Subject: [PATCH] restore old e* func output
-
-Gentoo has always used the sytle:
- * moo ... [ ok ]
-Latest openrc now does:
-* moo... [ok]
-
-Realistically, 4 spaces out of 80 on reduced terminals doesn't make any
-sort of realistic difference and it's been just fine for the last 10
-years, so keep the default behavior.
----
- src/libeinfo/libeinfo.c | 15 ++++++---------
- 1 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
-index 8a7613c..234b1af 100644
---- a/src/libeinfo/libeinfo.c
-+++ b/src/libeinfo/libeinfo.c
-@@ -643,7 +643,7 @@ static int EINFO_PRINTF(3, 0)
- fprintf(f, "\n");
- if (_eprefix)
- fprintf(f, "%s%s%s|", _ecolor(f, color), _eprefix, _ecolor(f, ECOLOR_NORMAL));
-- fprintf(f, "%s*%s ", _ecolor(f, color), _ecolor(f, ECOLOR_NORMAL));
-+ fprintf(f, " %s*%s ", _ecolor(f, color), _ecolor(f, ECOLOR_NORMAL));
- retval += _eindent(f);
- va_copy(ap, va);
- retval += vfprintf(f, fmt, ap) + 3;
-@@ -800,7 +800,7 @@ ebegin(const char *EINFO_RESTRICT fmt, ...)
- va_start(ap, fmt);
- retval = _einfovn(fmt, ap);
- va_end(ap);
-- retval += printf("...");
-+ retval += printf(" ...");
- if (colour_terminal(stdout))
- retval += printf("\n");
- LASTCMD("ebegin");
-@@ -817,7 +817,7 @@ _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
- if (!msg)
- return;
-
-- cols = get_term_columns(fp) - (strlen(msg) + 3);
-+ cols = get_term_columns(fp) - (strlen(msg) + 5);
-
- /* cons25 is special - we need to remove one char, otherwise things
- * do not align properly at all. */
-@@ -831,18 +831,15 @@ _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
- if (term_is_cons25)
- cols--;
-
-- /* If extra spacing is required around msg, then please change
-- * via a runtime knob and leave this default as is as it saves 2
-- * valuable columns when running on 80 column screens. */
- if (cols > 0 && colour_terminal(fp)) {
-- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols),
-+ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols),
- ecolor(ECOLOR_BRACKET), ecolor(color), msg,
- ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL));
- } else {
- if (col > 0)
- for (i = 0; i < cols - col; i++)
- fprintf(fp, " ");
-- fprintf(fp, " [%s]\n", msg);
-+ fprintf(fp, " [ %s ]\n", msg);
- }
- }
-
-@@ -1030,7 +1027,7 @@ ebeginv(const char *EINFO_RESTRICT fmt, ...)
-
- va_start(ap, fmt);
- retval = _einfovn(fmt, ap);
-- retval += printf("...");
-+ retval += printf(" ...");
- if (colour_terminal(stdout))
- retval += printf("\n");
- va_end(ap);
---
-1.6.6.rc3
-
diff --git a/sys-apps/openrc/files/openrc-9999-pause.patch b/sys-apps/openrc/files/openrc-9999-pause.patch
deleted file mode 100644
index bf2c94f8dbe..00000000000
--- a/sys-apps/openrc/files/openrc-9999-pause.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e82772a6b6d4374e81b7e19a593ffdef16753418 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 21 Dec 2009 09:02:35 -0500
-Subject: [PATCH] restore init.d pause option
-
----
- src/rc/runscript.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/src/rc/runscript.c b/src/rc/runscript.c
-index 5939dae..7147902 100644
---- a/src/rc/runscript.c
-+++ b/src/rc/runscript.c
-@@ -1316,6 +1316,12 @@ runscript(int argc, char **argv)
- prefix = NULL;
- retval = svc_exec("status", NULL);
- } else {
-+ if (strcmp(optarg, "pause") == 0) {
-+ ewarn("WARNING: 'pause' is deprecated; please use '--nodeps stop'");
-+ deps = false;
-+ optarg = "stop";
-+ }
-+
- if (strcmp(optarg, "conditionalrestart") == 0 ||
- strcmp(optarg, "condrestart") == 0)
- {
---
-1.6.6.rc3
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/
@ 2021-09-21 19:56 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-09-21 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 69381ce57ab8a515513c6d45075d4c7d55871223
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 21 19:56:02 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 19:56:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69381ce5
sys-apps/openrc: drop obsolete patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../openrc/files/openrc-0.44.4-fix-build.patch | 36 ----------------------
1 file changed, 36 deletions(-)
diff --git a/sys-apps/openrc/files/openrc-0.44.4-fix-build.patch b/sys-apps/openrc/files/openrc-0.44.4-fix-build.patch
deleted file mode 100644
index f9f91e5d337..00000000000
--- a/sys-apps/openrc/files/openrc-0.44.4-fix-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 28865d994099c4608cbd80f135f0733c1020ed5c Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Fri, 17 Sep 2021 14:24:36 -0500
-Subject: [PATCH] fix build for openrc and runscript
-
-X-Gentoo-Bug: 813483
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=813483
----
- src/rc/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/rc/meson.build b/src/rc/meson.build
-index fb9de00b..3898ac0c 100644
---- a/src/rc/meson.build
-+++ b/src/rc/meson.build
-@@ -53,7 +53,7 @@ executable('openrc-run',
- rc_selinux_c, version_h],
- c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
- link_with: [libeinfo, librc],
-- dependencies: [dl_dep, libpam, selinux_dep, util_dep],
-+ dependencies: [audit_dep, dl_dep, libpam, libpam_misc, selinux_dep, util_dep],
- include_directories: [incdir, einfo_incdir, rc_incdir],
- install: true,
- install_dir: sbindir)
-@@ -88,7 +88,7 @@ executable('runscript',
- rc_selinux_c, version_h],
- c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
- link_with: [libeinfo, librc],
-- dependencies: [dl_dep, libpam, util_dep, selinux_dep],
-+ dependencies: [audit_dep, dl_dep, libpam, util_dep, selinux_dep],
- include_directories: [incdir, einfo_incdir, rc_incdir],
- install: true,
- install_dir: sbindir)
---
-2.32.0
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/
@ 2022-04-02 18:32 William Hubbs
0 siblings, 0 replies; 6+ messages in thread
From: William Hubbs @ 2022-04-02 18:32 UTC (permalink / raw
To: gentoo-commits
commit: 7d5d9a780a8c895439b85d03a3b6ce70f4dd08c8
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 2 18:32:11 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Apr 2 18:32:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d5d9a78
sys-apps/openrc: drop unneeded patch
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
.../openrc/files/openrc-0.44.6-fix-checkpath.patch | 33 ----------------------
1 file changed, 33 deletions(-)
diff --git a/sys-apps/openrc/files/openrc-0.44.6-fix-checkpath.patch b/sys-apps/openrc/files/openrc-0.44.6-fix-checkpath.patch
deleted file mode 100644
index e1ef97d981dc..000000000000
--- a/sys-apps/openrc/files/openrc-0.44.6-fix-checkpath.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From cc45b55f895d0c21b5ac3e5a65b0bf00f76adeb7 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 8 Oct 2021 04:52:55 +0100
-Subject: [PATCH 1/2] checkpath: fix allocation size of path buffer
-
-strlen's return value isn't enough to be used
-directly for (x)malloc; it doesn't include
-the null byte at the end of the string.
-
-X-Gentoo-Bug: 816900
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/816900
-Fixes: #459
-Fixes: #462
----
- src/rc/checkpath.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rc/checkpath.c b/src/rc/checkpath.c
-index bab22692..c4dd7d9d 100644
---- a/src/rc/checkpath.c
-+++ b/src/rc/checkpath.c
-@@ -151,7 +151,7 @@ static char *clean_path(char *path)
- char *ch;
- char *ch2;
- char *str;
-- str = xmalloc(strlen(path));
-+ str = xmalloc(strlen(path) + 1);
- ch = path;
- ch2 = str;
- while (true) {
---
-2.32.0
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-04-02 18:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-20 22:27 [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/ William Hubbs
-- strict thread matches above, loose matches on Subject: below --
2022-04-02 18:32 William Hubbs
2021-09-21 19:56 Sam James
2017-02-05 16:37 David Seifert
2017-02-04 21:48 David Seifert
2017-02-04 21:22 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox