diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-09 09:26:20 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-09 09:37:21 +0000 |
commit | 603a2721d5440cf9e3af74c2bab093dcd528f47c (patch) | |
tree | c75711a8745955c9d317d688a18c0f512626c138 | |
parent | 9c0b81e09b5398c0ac153e208438681610cd76fe (diff) | |
download | alpine_aports-603a2721d5440cf9e3af74c2bab093dcd528f47c.tar.bz2 alpine_aports-603a2721d5440cf9e3af74c2bab093dcd528f47c.tar.xz alpine_aports-603a2721d5440cf9e3af74c2bab093dcd528f47c.zip |
main/openrc: remove warning about modloop boot opt
arm boot config will not let us specify the modloop name so we will
depend on search. We remove the warning.
-rw-r--r-- | main/openrc/APKBUILD | 8 | ||||
-rw-r--r-- | main/openrc/modloop.initd | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index f3d5671e3c..5844198a9d 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | pkgname=openrc | 2 | pkgname=openrc |
3 | pkgver=0.18.3 | 3 | pkgver=0.18.3 |
4 | _ver=${pkgver/_git*/} | 4 | _ver=${pkgver/_git*/} |
5 | pkgrel=3 | 5 | pkgrel=4 |
6 | pkgdesc="OpenRC manages the services, startup and shutdown of a host" | 6 | pkgdesc="OpenRC manages the services, startup and shutdown of a host" |
7 | url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" | 7 | url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" |
8 | arch="all" | 8 | arch="all" |
@@ -88,7 +88,7 @@ d83df5513f08f09fa9e7353327701bf7 openrc.logrotate | |||
88 | 887eba592d487d6ffe2b42cfcd2813df hwdrivers.initd | 88 | 887eba592d487d6ffe2b42cfcd2813df hwdrivers.initd |
89 | 41974f5408fd2e92892f891b58f2e49f keymaps.initd | 89 | 41974f5408fd2e92892f891b58f2e49f keymaps.initd |
90 | 0ece77eff8f163b36f6f0e7a6d422866 modules.initd | 90 | 0ece77eff8f163b36f6f0e7a6d422866 modules.initd |
91 | 8c648e985ebccc651966f738c0c2a413 modloop.initd | 91 | 9462da81ea18471154c820b81eb0de8e modloop.initd |
92 | 27c22aa4e5cdba499ac9a0b6b9385f7d networking.initd | 92 | 27c22aa4e5cdba499ac9a0b6b9385f7d networking.initd |
93 | c1ec888202d868710b5749f7b217d1e3 modloop.confd | 93 | c1ec888202d868710b5749f7b217d1e3 modloop.confd |
94 | bd51c5353d6dbbb34d929bf59097b232 consolefont.initd | 94 | bd51c5353d6dbbb34d929bf59097b232 consolefont.initd |
@@ -106,7 +106,7 @@ e23db45e9399dab96d6c922af6c0cd6c243bbcc43756c845b70a9c7222a96313 hostname.initd | |||
106 | 6cb4d9ea3ad562bcf2697f61f5a76a10481d23f5dead570f82eff576eaca5236 hwdrivers.initd | 106 | 6cb4d9ea3ad562bcf2697f61f5a76a10481d23f5dead570f82eff576eaca5236 hwdrivers.initd |
107 | 32562d39ade4092df8163c2e8cf0b31eeec06aa5713d343e1c487bfa6d9f7c84 keymaps.initd | 107 | 32562d39ade4092df8163c2e8cf0b31eeec06aa5713d343e1c487bfa6d9f7c84 keymaps.initd |
108 | a145636e84547d76b8a188a94c0a76fcc266cd0f486be6cf24d2d74f03038118 modules.initd | 108 | a145636e84547d76b8a188a94c0a76fcc266cd0f486be6cf24d2d74f03038118 modules.initd |
109 | 7cd29930faa7bf322d5fbc58933881c417ed55a4fcccb55a7a8fcc9a995bed15 modloop.initd | 109 | 5af33627b2f956f81e272441e3a27206f61d08d0151b009c0cbed280bb50f0b5 modloop.initd |
110 | 66151b5cc199485ddd188528a0f22f081994721f04c15b33df38f41a5d08ea78 networking.initd | 110 | 66151b5cc199485ddd188528a0f22f081994721f04c15b33df38f41a5d08ea78 networking.initd |
111 | a5a0316cd59f5401b1d789bb466c98186201277ba6f014017b14965fcc10c254 modloop.confd | 111 | a5a0316cd59f5401b1d789bb466c98186201277ba6f014017b14965fcc10c254 modloop.confd |
112 | 8a3f663e9ac14f62c3aef4121736a71edd676bdc9dd93c1d411f13a0e7ab4ee6 consolefont.initd | 112 | 8a3f663e9ac14f62c3aef4121736a71edd676bdc9dd93c1d411f13a0e7ab4ee6 consolefont.initd |
@@ -124,7 +124,7 @@ a6e2b44dd548a2470971a44b61ddaaec037438050fe3411b4ea3fe5d36e9ad4cf5b5e226f8d4aacb | |||
124 | b51d95df7b692aaea3e14ed009d99b46b82500d505e2eeecb6a20136cee140aea4a7377a65ccc5c51fff64be7a50666be48616d179888eaeff9d35178a7a772b hwdrivers.initd | 124 | b51d95df7b692aaea3e14ed009d99b46b82500d505e2eeecb6a20136cee140aea4a7377a65ccc5c51fff64be7a50666be48616d179888eaeff9d35178a7a772b hwdrivers.initd |
125 | 584ecbbcecb284527d7616790b6e337ace610e4b3cedf2993eca294bfbef54674aeaee3078b6c17d746a0c48b5a64a813c3534136915947e6f62a6fa206cd3ca keymaps.initd | 125 | 584ecbbcecb284527d7616790b6e337ace610e4b3cedf2993eca294bfbef54674aeaee3078b6c17d746a0c48b5a64a813c3534136915947e6f62a6fa206cd3ca keymaps.initd |
126 | 7702e2704e4bcfad7c0736eec4cb0e8b20a685851afb5bd9022c5056ea78b8598a9402bae9644ae3268e2ff1c566e147cbb8d00e143491841682e4125fde2a75 modules.initd | 126 | 7702e2704e4bcfad7c0736eec4cb0e8b20a685851afb5bd9022c5056ea78b8598a9402bae9644ae3268e2ff1c566e147cbb8d00e143491841682e4125fde2a75 modules.initd |
127 | c27729592e2ad848c570ec5bf76a1c905efd9c754eca7289eb2af74b19183edddeae2c3304f87f43cd430f4431d87495cfd5f271fd6edf54a9a2ed341969c897 modloop.initd | 127 | 32617e1ee365e53eaa7a9508b89cf50d2a09a685c9e254a6e0b98e297b46a2d5104ab4925ed204db0a948388fe2943e4e3761ac593fdf7a3a7171fde19255158 modloop.initd |
128 | 9aeba2c5cae539f16185b82c6e6e84c1b044e838749b92e8994172296d86ec3f1c674d62d54db1e08a8191e513ddb0ab3509f50ccae6cb5d7ba5ff5a5b6abb46 networking.initd | 128 | 9aeba2c5cae539f16185b82c6e6e84c1b044e838749b92e8994172296d86ec3f1c674d62d54db1e08a8191e513ddb0ab3509f50ccae6cb5d7ba5ff5a5b6abb46 networking.initd |
129 | aa702a7da8e6c0e5d8738febaf6b4e4cb021b30ce5c1809b530abf2b36739079446b16fc054740da8d86ed099942cf5deed6597cedb64c058f3def587a8b4689 modloop.confd | 129 | aa702a7da8e6c0e5d8738febaf6b4e4cb021b30ce5c1809b530abf2b36739079446b16fc054740da8d86ed099942cf5deed6597cedb64c058f3def587a8b4689 modloop.confd |
130 | c8d52d69692a00862cd55719174d7a260d5149f4951dd71196f5e9cebce3a75420a8815f0fe8b186d00b4d46739dc54542dae01a941605fcb1435f4385e444b7 consolefont.initd | 130 | c8d52d69692a00862cd55719174d7a260d5149f4951dd71196f5e9cebce3a75420a8815f0fe8b186d00b4d46739dc54542dae01a941605fcb1435f4385e444b7 consolefont.initd |
diff --git a/main/openrc/modloop.initd b/main/openrc/modloop.initd index 14b8687adf..fd11d72341 100644 --- a/main/openrc/modloop.initd +++ b/main/openrc/modloop.initd | |||
@@ -64,9 +64,6 @@ start() { | |||
64 | wget -P "$modloop_dldir" "$KOPT_modloop" \ | 64 | wget -P "$modloop_dldir" "$KOPT_modloop" \ |
65 | && modloop=$modloop_dldir/$(basename $KOPT_modloop) | 65 | && modloop=$modloop_dldir/$(basename $KOPT_modloop) |
66 | ;; | 66 | ;; |
67 | "") | ||
68 | ewarn "WARNING! modloop boot option is missing." | ||
69 | ;; | ||
70 | *) | 67 | *) |
71 | for dir in $(mountdirs); do | 68 | for dir in $(mountdirs); do |
72 | if [ -f "$dir"/$KOPT_modloop ]; then | 69 | if [ -f "$dir"/$KOPT_modloop ]; then |