mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-05-01 19:20:56 +02:00
openrc: cleanup: all *.start script moved into pentoo/pentoo. Branding is the only thing left under the "pentoo" use flag. Do we need it?
This commit is contained in:
Anton Bolshakov
parent
196cf69671
commit
43b7f938f3
10 changed files with 2 additions and 401 deletions
|
|
@ -1,18 +1,10 @@
|
|||
AUX 00-linux-link.start 383 SHA256 1022f30ba59b838dd38d717f95e60e9339e7bd3ca621ca728b432ea6997b3142 SHA512 1882828a3efc28aa4c6c1e84e80b2e5d8018684ccaa48a19fbed8202db88d4867b90ebea61f09f69082b5466ac911568e2b546dc681967d84cb34ea29184f12c WHIRLPOOL c41aac6ceba1af599da512ca4e830c2b724d4e709cb381cdc8af27bb66c81be7c56008c952aaa86c93b6bf2e31c62a00335bec948add15cb7254bcc9164b15ec
|
||||
AUX 9999/0001-msg-style.patch 1714 SHA256 4c819af483240b1c822d25ae3e604376b6255b4577c191bddfc84c309efab08e SHA512 6073ec4fff87871c04755066aaafdf7d5cc936f963b447f63d5da98456eddea2b87f1d1fdbb7086523d5fcbe5dc76647399a1e81fa68dbd4307f6a16791918e3 WHIRLPOOL 47558307f0446bf53510a433208f775b9dbc6460f3d9e970f7d3e48b0f0812bd0824f26177f847deb7925324f7fa81f2f17761e89ca543c41f147d66c0c546e4
|
||||
AUX 9999/0002-useful-functions.patch 1801 SHA256 de5e11cd8c514353a5f97b13df52a7220b1b967dd0586336d16864d6c372c62f SHA512 7f02bed26b49881d73738ae2f3491514153578358d1f780d013d87106e5a079c3d9f29bcd9041209f5a4816865e43f54e4dab0d647ed0f37056363da797f91a7 WHIRLPOOL f1fc0f23a61c975850a85d8221cd1be59ccf2c1eaac93d42fe3c53cf141b29aa071b2e45e97a11e9b42706061b6274ba6a10a36189908037bbed7195a07caf7b
|
||||
AUX 9999/0003-KV.patch 2565 SHA256 44be27f8bf419489b29507a8ddab74ff890d6ebcfa316570077393f1c6bac082 SHA512 9c22421aa845080fc79988fbad445979381b439ea5629cec810e5b1e3fb1f344a47bc30c5f5d9ba2c0957f7a72820d6c51613fa101d537f8274ab70da9d9bcfa WHIRLPOOL bef6789b03a64114bb14e7827d734e5d8fc2b419727375588be5d3afdbaa463d154f6511c80fa1c8b236c60f166d9ce9addbbf838c572c8a893cbd3a9690fe06
|
||||
AUX compat-wireless.start 773 SHA256 32e5734a0455f9db5aa93d97cd028fee1a934c5c20dc1c456cb334030569ec7e SHA512 3168debd53c845cef1f1a6a4f552a97dca4ea53cfa0292fc9d50bf1491e23d30d7811890a3b6a2af015f369a7cfbf7816c1e613916a56c9a903eac5b6b397d28 WHIRLPOOL 5ded3cd68bcea010cdd7207012927eece66868b99840f57e48152199152f934459dd692c628f24b4bcc649329f1ded26c6ddcd3916b3e7dbea7053d296e9c900
|
||||
AUX openrc-0.8.3-ccwgroup.patch 1992 SHA256 5a092cc0ab90507c28f8bd6af34b67fbb3d8a9ddce257195dde55128f87324fc SHA512 bea08e3064b8253713d996098006e8f636fef8e071d0c373b91db643c678aff36d490c5db853c97c91e0ce53f10c4db3d2b104283303aba1d3841058d5e3bb4a WHIRLPOOL a37fbb6fb31abab0631d61baa61280330791209c329aed0c41ffef1ffdab9e0ba41732404035f8a26865077b1d857387f4d253c71febfc9743ff864b484ec1cf
|
||||
AUX openrc-0.8.3-deprecation_warning.patch 1055 SHA256 fa95aaa34db3556240031fcfb5e33d85e44da2a2f74562faa97c75f569d4efa0 SHA512 72f8dc6a931ea4c97f337a1a358ccc4fc3600d8809e549afad8697fc74a07fa6f1460603d5c80ea08af2e441ad8cb7f404454876dce1244fdba13099f948d00a WHIRLPOOL 5bcee2abc2158ce750b94fee97f6e270adf4d5098bac2d64d2423bae462ce3b702c5df52d3e013e0027db66e09edde1c7aca1d5b8d77088f0f8937f968eba176
|
||||
AUX openrc.logrotate 71 SHA256 0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c SHA512 690612fddfb2c4cf8f6b5ba7239b9faf29eb3d9b152ab4dcf62694aa2852780440d08cee56d98a9597607f446b3697c911269562821a8402bb5747cbbae34bd9 WHIRLPOOL 8678c51583c77a4985760e4ea2082e7214f28b68cad460b362d683db71067cf6031e1f3275e83ac7959b0973cdafd0a4102525fe7b0d975798ec2182d1fd2769
|
||||
AUX power_saving.start 633 SHA256 8ed0939553cdf08bf097f1ec85fe3a9ca134659a3b2f7eb1c89fcfdb886f9665 SHA512 359e6ee65ae6b442f985690e9632002d46fdc9c80bb4a2041e0a49d243aa76be4dcd5453dd23a852c14c2b204d7a5b456db06db4b5845a48c254fa1b527d58b5 WHIRLPOOL 2253495924532a8be354169d93e82aa5f6f350bf4266c62acf1e4a97f9b24292b7ceeb42892df9c153a8bab5d252a48922ef765ea6c847aec3a188beb2a0ec36
|
||||
AUX start-stop-daemon.pam 63 SHA256 2681da17e4a122656b5303b7c7eca82b8fb182641290b153fdbe96b63638086d SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb WHIRLPOOL 4abc9f051155a62d3033258a06003a4ca3909d8104deca84d5c1605bc1c7e56167fd82b2b4b72fe7b707070de98a7628730de1ad3f14b924b5b1480fba5ef854
|
||||
DIST openrc-0.10.5.tar.bz2 171742 SHA256 27677142a7aa47a1c7e863fd4bce0d092aca7870012812e4f7a690a14f1e242c
|
||||
DIST openrc-0.10.5.tar.bz2 171742 SHA256 27677142a7aa47a1c7e863fd4bce0d092aca7870012812e4f7a690a14f1e242c SHA512 f855d5f1b115cc4387585b9533fba78d22b7c54379a26e3d26995c1ff5b3bbe11bb6e6adc715d35710fcff77449d23bcdbbd4fbb5ea74e66a2ba224dfe2746e3 WHIRLPOOL f39a88e1f44f741f8eb31db07e5bb199253912d5c3cc7d9006467d52e07d5b814c1e3d2d652e1b503a5a81b953be094d2c95a50397812301f76abef6e44c608f
|
||||
DIST openrc-0.9.4.tar.bz2 163514 SHA256 0da3981de88c16b24d14b37d4d2eb0f631cbe5ebe3058dd8c2e32f7092937ae3
|
||||
DIST openrc-0.9.8.4.tar.bz2 166843 SHA256 904e139a90d5f610b59f9e0cc52ddac487c58e4fa73468b5e9fdac1a03362533
|
||||
DIST openrc-0.9.9.3.tar.bz2 169462 SHA256 75487579982eddee9bbc7c3f6515ef8924eefd35c4829361e2b4c4c69bd047ab SHA512 7fc7cc47aa14375a0dbd9943ee9e3e542f99b38b00a2692c8e4c193164871f17e1c76999d14b5d179d9449dd7b521bbd574d77519881d59a6004d56352128621 WHIRLPOOL e03b19a4c287d3f74400b9aa5d0c871f0e5d7e076b12e962864c081fc7b4dbdd4904b1f4369846202f271072de5c1e435f8a4f6a88b5cbf33c4fe42fc8dacfd1
|
||||
EBUILD openrc-0.10.5.ebuild 14621 SHA256 cbe50884f765ee9070af0e243dd6c8d2a05af5c4585775119a21993d8b1e12fc SHA512 68220ebac978f224e04433743626e1c19742bff4fff0f0d10bfa59ab28d2c462c40313c0c59a96e7cd39e0d53a07474a4b8fcd3d38728488ac8a0a5adb6489ed WHIRLPOOL a6d38c331f1c470a33f7afbd464b82787fbb581d12045e7364ab65ece0c4bbfad1be0a137f263106d7efb6f8c09dd89c90369c8b102b5d72c6bfa3eda1c4aac3
|
||||
EBUILD openrc-0.10.5-r1.ebuild 14497 SHA256 40e9d61027220ff0ab5d984ef0b0b7de3a43e3d39db4484a13d54a320e0d6334 SHA512 9fcfeba3de6a7247755c28805bf3c8a674a265393497aa975c75e122fbda1a76503888e35e2709bed5e2ebc1267904a57d4c3cd77c4973fd088aca5d9df0ca72 WHIRLPOOL 89554eecef3d578bf29abc95633f7451dd2d161055980706136b298027e3c5da8056e02f48bb1b5be017b41e32a5729573684ed47a5021f64be60a58db7f4c74
|
||||
EBUILD openrc-0.9.4-r1.ebuild 14436 SHA256 8b945821399508a079566b01fb409eefd2336127055286eab10f7de6f9ce5453 SHA512 f72e90015cdf024dab3744a21ba0ed3c74c52e11bb3b591d317df2d0ff51f104fe914ab2213c81fcb8da3d4b228b997a10e64ff7d8051c435c3edc1d625b8bb9 WHIRLPOOL 2ecf793f1493aa713f51e7cefdb97aaff40219c5f00916bb5da7165c93f7aa731300757d5b6a86bb61f6195fb7e8e65894dfb0070274e9f0622339f1d420fe04
|
||||
EBUILD openrc-0.9.8.4.ebuild 14220 SHA256 869ac4655fbfe56d47c0d7708987fbf07c8a682ad166eff0493fa88cf835515e SHA512 232d1b3810222e31b931f073dcab7c3aa9d91f565f8fe1ec84f0e99505f4f90cb930741dd913a9d06b2b35c2369f72c966e84918006f912acb868f87c7b86168 WHIRLPOOL d64bcc4fbe3f78a9059dd4efccf01c69c862df4ca7d736e3f1f0c2bb8b86140f0ebd27a81ffb256464e2d378e96efeb96fed42c6a19f1da5c0fe50e1ac73d15a
|
||||
EBUILD openrc-0.9.9.3.ebuild 14365 SHA256 0d3d539312839a0ef7c442302778e16fbf85966207ccea029a6cc579ed805e8d SHA512 3d4782a8f283dc77627b374ed6f0c8b156856c83bae1455c02da2f8585a2bfdca37ecbd87253db1dce64f1bde2514321835c7109a50a9e5507714c1b6bfacda3 WHIRLPOOL edf689d717399e485626d223914ee9c25035d17c35a028202fd1db0b5b6a9143e70b0e38c86cce542b3a761f62ca2717c302f98f10001debaf5a1dad7cded51f
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
##adjust /usr/src/linux link if we are pretty sure we won't screw up the system
|
||||
KV=$(uname -r)
|
||||
if [ -d /usr/src/linux-${KV} ]
|
||||
then
|
||||
if [ -L /usr/src/linux ]
|
||||
then
|
||||
unlink /usr/src/linux
|
||||
fi
|
||||
|
||||
ln -s /usr/src/linux-${KV} /usr/src/linux
|
||||
|
||||
if [ -L /lib/modules/${KV}/build ]
|
||||
then
|
||||
unlink /lib/modules/${KV}/build
|
||||
fi
|
||||
ln -s /usr/src/linux-${KV} /lib/modules/${KV}/build
|
||||
fi
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
From 1eddb56f11b41c4bf4f878c995c5d140b1f9d44d Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Mon, 24 Mar 2008 01:48:19 -0400
|
||||
Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo.
|
||||
|
||||
---
|
||||
src/libeinfo/libeinfo.c | 9 +++------
|
||||
1 files changed, 3 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
|
||||
index f8ddcb5..c46cacb 100644
|
||||
--- a/src/libeinfo/libeinfo.c
|
||||
+++ b/src/libeinfo/libeinfo.c
|
||||
@@ -817,7 +817,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
|
||||
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 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
1.5.4.4
|
||||
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
From 79e8ce8d2ea0ede99aba18d5f9a625a110aa918f Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Mon, 24 Mar 2008 02:03:39 -0400
|
||||
Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api
|
||||
|
||||
---
|
||||
sh/functions.sh.in | 22 ++++++++++++++++++++++
|
||||
sh/rc-functions.sh.in | 23 -----------------------
|
||||
2 files changed, 22 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/sh/functions.sh.in b/sh/functions.sh.in
|
||||
index 3f41f8f..be5285c 100644
|
||||
--- a/sh/functions.sh.in
|
||||
+++ b/sh/functions.sh.in
|
||||
@@ -42,6 +42,29 @@ rc_runlevel() {
|
||||
rc-status --runlevel
|
||||
}
|
||||
|
||||
+get_bootparam()
|
||||
+{
|
||||
+ local match="$1"
|
||||
+ [ -z "$match" -o ! -r /proc/cmdline ] && return 1
|
||||
+
|
||||
+ set -- $(cat /proc/cmdline)
|
||||
+ while [ -n "$1" ]; do
|
||||
+ [ "$1" = "$match" ] && return 0
|
||||
+ case "$1" in
|
||||
+ gentoo=*)
|
||||
+ local params="${1##*=}"
|
||||
+ local IFS=, x=
|
||||
+ for x in $params; do
|
||||
+ [ "$x" = "$match" ] && return 0
|
||||
+ done
|
||||
+ ;;
|
||||
+ esac
|
||||
+ shift
|
||||
+ done
|
||||
+
|
||||
+ return 1
|
||||
+}
|
||||
+
|
||||
_sanitize_path()
|
||||
{
|
||||
local IFS=":" p= path=
|
||||
diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in
|
||||
index ebdb768..68cd6e7 100644
|
||||
--- a/sh/rc-functions.sh.in
|
||||
+++ b/sh/rc-functions.sh.in
|
||||
@@ -61,29 +61,6 @@ is_union_fs()
|
||||
unionctl "$1" --list >/dev/null 2>&1
|
||||
}
|
||||
|
||||
-get_bootparam()
|
||||
-{
|
||||
- local match="$1"
|
||||
- [ -z "$match" -o ! -r /proc/cmdline ] && return 1
|
||||
-
|
||||
- set -- $(cat /proc/cmdline)
|
||||
- while [ -n "$1" ]; do
|
||||
- [ "$1" = "$match" ] && return 0
|
||||
- case "$1" in
|
||||
- gentoo=*)
|
||||
- local params="${1##*=}"
|
||||
- local IFS=, x=
|
||||
- for x in $params; do
|
||||
- [ "$x" = "$match" ] && return 0
|
||||
- done
|
||||
- ;;
|
||||
- esac
|
||||
- shift
|
||||
- done
|
||||
-
|
||||
- return 1
|
||||
-}
|
||||
-
|
||||
# Add our sbin to $PATH
|
||||
case "$PATH" in
|
||||
"$RC_LIBDIR"/sbin|"$RC_LIBDIR"/sbin:*);;
|
||||
|
|
@ -1,120 +0,0 @@
|
|||
From dac703b26c71cd8479b71d101c4e1ddb8eadc194 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Mon, 24 Mar 2008 03:14:02 -0400
|
||||
Subject: [PATCH] add back KV_* funcs
|
||||
|
||||
---
|
||||
sh/functions.sh.in | 35 +++++++++++++++++++++++++++++++++++
|
||||
sh/runtests.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 80 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/sh/functions.sh.in b/sh/functions.sh.in
|
||||
index 140f6dc..0522792 100644
|
||||
--- a/sh/functions.sh.in
|
||||
+++ b/sh/functions.sh.in
|
||||
@@ -65,6 +65,41 @@ get_bootparam()
|
||||
return 1
|
||||
}
|
||||
|
||||
+KV_major() {
|
||||
+ [ -z "$*" ] && return 1
|
||||
+ local KV="$*"
|
||||
+ echo ${KV%%.*}
|
||||
+}
|
||||
+
|
||||
+KV_minor() {
|
||||
+ [ -z "$*" ] && return 1
|
||||
+ local KV="$*"
|
||||
+ KV=${KV#*.}
|
||||
+ echo ${KV%%.*}
|
||||
+}
|
||||
+
|
||||
+KV_micro() {
|
||||
+ [ -z "$*" ] && return 1
|
||||
+ local KV="$*"
|
||||
+ KV=${KV#*.*.}
|
||||
+ echo ${KV%%[![:digit:]]*}
|
||||
+}
|
||||
+
|
||||
+KV_to_int() {
|
||||
+ [ -z "$*" ] && return 1
|
||||
+ local KV_MAJOR="$(KV_major "$*")"
|
||||
+ local KV_MINOR="$(KV_minor "$*")"
|
||||
+ local KV_MICRO="$(KV_micro "$*")"
|
||||
+ local KV_int="$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))"
|
||||
+ echo "${KV_int}"
|
||||
+}
|
||||
+
|
||||
+_RC_GET_KV_CACHE=""
|
||||
+get_KV() {
|
||||
+ [ -z ${_RC_GET_KV_CACHE} ] && _RC_GET_KV_CACHE=$(uname -r)
|
||||
+ echo $(KV_to_int "${_RC_GET_KV_CACHE}")
|
||||
+}
|
||||
+
|
||||
_sanitize_path()
|
||||
{
|
||||
local IFS=":" p= path=
|
||||
diff --git a/sh/runtests.sh b/sh/runtests.sh
|
||||
index d0d6a17..debcf4f 100755
|
||||
--- a/sh/runtests.sh
|
||||
+++ b/sh/runtests.sh
|
||||
@@ -3,6 +3,19 @@
|
||||
: ${top_srcdir:=..}
|
||||
. $top_srcdir/test/setup_env.sh
|
||||
|
||||
+checkit() {
|
||||
+ local output=$($1 $3)
|
||||
+ local lret=$?
|
||||
+ if [ ${lret} -ne 0 ] ; then
|
||||
+ ((tret+=lret))
|
||||
+ echo "FAIL: exec: $*"
|
||||
+ fi
|
||||
+ if [ "${output}" != "$2" ] ; then
|
||||
+ ((tret+=lret))
|
||||
+ echo "FAIL: output: $* : got='${output}' wanted='$2'"
|
||||
+ fi
|
||||
+}
|
||||
+
|
||||
ret=0
|
||||
|
||||
tret=0
|
||||
@@ -22,4 +35,36 @@ done
|
||||
eend $tret
|
||||
ret=$(($ret + $tret))
|
||||
|
||||
+compare_int() {
|
||||
+ local got=$(KV_to_int $1)
|
||||
+ local exp=$(KV_to_int $3)
|
||||
+ if ! [ ${got} $2 ${exp} ] ; then
|
||||
+ ((tret+=1))
|
||||
+ echo "FAIL: KV_to_int '${v}'(${got}) $2 '1.2.2'(${exp})"
|
||||
+ fi
|
||||
+}
|
||||
+
|
||||
+tret=0
|
||||
+ebegin "Testing KV_{major,minor,micro,to_int}"
|
||||
+for v in \
|
||||
+ 1.2.3 1.2.3-rc0 1.2.3_rc0 "1.2.3 rc0" \
|
||||
+ 1.2.3.4 1.2.3.4-rc0 1.2.3.4_rc0 "1.2.3.4 rc0"
|
||||
+do
|
||||
+ checkit KV_major 1 ${v}
|
||||
+ checkit KV_minor 2 ${v}
|
||||
+ checkit KV_micro 3 ${v}
|
||||
+
|
||||
+ compare_int 1.2.2 -lt ${v}
|
||||
+ compare_int 1.2.2.10 -lt ${v}
|
||||
+ compare_int 1.2.4 -gt ${v}
|
||||
+ compare_int 1.2.4-rc0 -gt ${v}
|
||||
+ compare_int 1.2.3 -eq ${v}
|
||||
+ compare_int 1.2.3-rc0 -eq ${v}
|
||||
+ compare_int 1.2.3.2 -eq ${v}
|
||||
+ compare_int 1.2.3.3 -eq ${v}
|
||||
+ compare_int 1.2.3.4 -eq ${v}
|
||||
+done
|
||||
+eend ${tret}
|
||||
+: $((ret+=tret))
|
||||
+
|
||||
exit $ret
|
||||
--
|
||||
1.5.4.4
|
||||
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
### THIS SUCKS
|
||||
### In a newer portage "emerge --list sets" will contain a kernel modules option
|
||||
### However, we are not using that portage version yet....
|
||||
### So until that is stable, we hack this to ensure compat-wireless is installed
|
||||
### ...and leave the rest to the user
|
||||
|
||||
##rebuild compat-wireless modules if needed
|
||||
if [ -e /var/lib/portage/world ]
|
||||
then
|
||||
#okay, confirmed we are gentoo...
|
||||
#now check if compat-wireless is installed
|
||||
if [ ! -e /lib/modules/`uname -r`/updates/compat/compat.ko ]
|
||||
then
|
||||
#the line below should rebuild compat-wireless iff it was already
|
||||
#installed and isn't installed for the current kernel version
|
||||
grep --quiet compat-wireless /var/lib/portage/world && ( emerge --nodeps -1 --quiet compat-wireless >/dev/null & )
|
||||
|
||||
fi
|
||||
fi
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
#grep on-line /proc/acpi/ac_adapter/AC/state >/dev/null || ( cpufreq-set -c 0 -g ondemand; cpufreq-set -c 1 -g ondemand )
|
||||
cpufreq-set -c 0 -g ondemand; cpufreq-set -c 1 -g ondemand
|
||||
echo medium_power > /sys/class/scsi_host/host0/link_power_management_policy
|
||||
|
||||
#PM runtime (PCI Devices)
|
||||
for i in `find /sys/devices/pci* -name "control"`; do echo "auto" > $i; done
|
||||
|
||||
#USB Suspend
|
||||
for i in /sys/bus/usb/devices/*/power/autosuspend; do echo 1 > $i; done
|
||||
for i in /sys/bus/usb/devices/*/power/control; do echo auto > $i; done
|
||||
|
||||
#disable NMI watchdog (unless we are running a redundant kernel
|
||||
echo 0 > /proc/sys/kernel/nmi_watchdog
|
||||
|
|
@ -423,8 +423,6 @@ pkg_postinst() {
|
|||
fi
|
||||
|
||||
if use kernel_linux && [[ "${ROOT}" = "/" ]]; then
|
||||
use pentoo && cp "${FILESDIR}"/*.start "${ROOT}"etc/local.d/
|
||||
use pentoo && chmod +x "${ROOT}"etc/local.d/*.{start,stop}
|
||||
if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
|
||||
ewarn "The dependency data could not be migrated to /run/openrc."
|
||||
ewarn "This means you need to reboot your system."
|
||||
Loading…
Reference in a new issue