From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. acf0e4d2daa279b0e28bbbf213501e7a320cbffc
Date: Thu, 09 Mar 2017 11:05:15 +0000 [thread overview]
Message-ID: <20170309110517.0BE0C10853C3@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 112594 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via acf0e4d2daa279b0e28bbbf213501e7a320cbffc (commit)
via ad898e7f46ef659a639ea23768ffd394057a7064 (commit)
via 713151aaa8a4d3af467081912bca7991db4d5af6 (commit)
via 530188483521ffe055141c635530cf4e80955374 (commit)
via edda4a223bba278c24ac093baed89249d0b30083 (commit)
via bd2a7a8fd3ab37d3d2f28a56494e147005902ead (commit)
via 9016d19e0e22c14974f2283c5661f9c2fe17ab6c (commit)
via 7e8a2556e55f3023e257348dae447321c0034870 (commit)
via a5754e5da1830180d488306b10d3688babd6a4b8 (commit)
via 586761dd73fa21f39b22f0cb8b5d1112cfb7ce64 (commit)
via de63e05b49ae04b883e1c5b6d628cd9fba923408 (commit)
via dd1884ddb309b2bdee985f0805ab893bac1e45bd (commit)
via da5c2f96303d544989f39dda6561964578a41034 (commit)
via 4fa43dd1009a24083db4c8e075ba09d115530c3f (commit)
via 9f312b3dde6578c6a3710694ec2e1df3ae677a9a (commit)
via e5379b19813b57c337b00ac0c37c48ad606854d5 (commit)
via 41e5aa4a8809a199dd120cb913270b561bce6a94 (commit)
via 112fb61b69f58f23b978cdd2982a57644e8e79dd (commit)
via da6608ef68b8f7beee31a3d957c3e986d4d54a26 (commit)
via f09be2a5350b53ec191dcdebe4c105e7835022e5 (commit)
via 17f7f41e4147c5653591c1413e576d72461cc1cb (commit)
via 7d9b033b79af8124853a0aac6992389ea8595172 (commit)
via 896209f6f147d6213fe790c2e6e538440fa66612 (commit)
via 89760da44254a7eb74ab0cee02c93763a036e50f (commit)
via 8bcca7ca0a042e94e030f03492becd0026afad02 (commit)
via 746b72fea87b21ac18730adb20b8d2cf0500a9d8 (commit)
via ff0f73305cc7ae85cc18b1e3500285c47597bb23 (commit)
via 76589562ea8921d8d5b5f009f568c67a5be41e7c (commit)
via 06c99e6d4d6e65dea00ea94585a30c08635b29d0 (commit)
via 2e57eb171395c80658249a476b69a8a4ad21b2e1 (commit)
via 7f328d35400a8612a96eeacc6756187255f329d8 (commit)
via a0851cf32881fecd7b00610c0fc89f46de67d376 (commit)
via 87f382731fecd9818bf81e4fae8450107b601cd4 (commit)
via 8ab50dba65e02cbfd4edb2ce81e32caef22ff193 (commit)
via 5283818233fe07b1efd52a53b8d894960843629e (commit)
via 74eaa64e4ba95d94a387e8756d954a1b5b0f9b13 (commit)
via dc9baa5496ea41b890927098e222e297e99a1db0 (commit)
via f79869bf421437654fde325b4eb262ebe3dbe292 (commit)
via 8fa8cd3b7e10ee7564465de4af60164c32a813ab (commit)
via 610b34069c6f6ebd857f5cd0c4d3b70e4b4c0143 (commit)
via e215aaed48d8dfe3c7f6dd2bc649fb5b7547eef3 (commit)
via 939fbafccdacfb0c078daa166829311366257b8c (commit)
via 47b6926102a00809aa8929ddd86907aa168850a0 (commit)
via e804a70256d72c7ad76913bde373f2f97f84c21f (commit)
via 5f53bd1c13f6ef6387313768bd8cd250499f66cb (commit)
via c5480346b1ace5d630d5a82e73077bd48e9bf42c (commit)
via e7301348846afeb0e7f27d801bac2f19763e1c53 (commit)
via ba43a6fee28b7e00c4f5cead38107b3d0300a242 (commit)
via df7f06eceb31dc8c0392b84d91dc24756bebe947 (commit)
via f22bfcf48c6e3014615254922cb4515afec172a7 (commit)
via c08b75dbb5fbd3b47adcc0a39bea5d7b1752e948 (commit)
via dbb35fa6a4c969696411334280d2e688fc79062e (commit)
via 7db55a67798656f851689863d8401839c8f385a2 (commit)
via afb143bd7cd9cdf1c68e33f3f7e2f9cad1900c22 (commit)
via db8a26e71877cc698ead7cc6191a020eaa5648bc (commit)
via 1f68460f5afd37e4a58959a006e09f10fe1c0cff (commit)
via c8b7d517d0e687d72bc71816f0f26581a0145edf (commit)
via 6a4df2fd3b375c77bbdb99a0bb8b952f7116a3f8 (commit)
via be2732c2171613d98f830ef0f6da313424060c3b (commit)
via 38888b3d927ddd5b47de337cf197494d4a53de7b (commit)
via 629fcb1d47d686c6182b3ed9e0e49650f40cc6e1 (commit)
via 33f53d55ccec436a6cbd80ea469ea4a558528798 (commit)
via c6060f2dcf49f2a20406485d0507cb14a513b44b (commit)
via cb144b4f8a854d911401b9ed6d7ef2916eb2dc50 (commit)
via 1d8dab5404b4e1a662e6f0398a552f8f6251bee6 (commit)
via 8bc8c282c9b7ef2280e7102e2824047975a9bb4c (commit)
from 2bfd31a26187d65236ee6e0a0d22def30e25b0e5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit acf0e4d2daa279b0e28bbbf213501e7a320cbffc
Merge: 2bfd31a ad898e7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Mar 9 11:04:52 2017 +0000
Merge branch 'initscripts-cleanup' of git://git.ipfire.org/people/jschlag/ipfire-2.x into next
commit ad898e7f46ef659a639ea23768ffd394057a7064
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Mon Mar 6 17:31:10 2017 +0100
Move the position of the initscripts lfs in the build process
We need the directory /etc/rc.d/init.d earlier in the build process
because the initscripts are copied in the lfs files like in lfs/mysql
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 713151aaa8a4d3af467081912bca7991db4d5af6
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Mon Mar 6 17:25:10 2017 +0100
Strongswan: Remove unnecessary commands concern initscripts
It is not necessary to copy the init scripts and remove the symlinks for
runnlevel interaction.
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 530188483521ffe055141c635530cf4e80955374
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 16:46:35 2017 +0100
Remove unused applejuice script
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit edda4a223bba278c24ac093baed89249d0b30083
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 16:45:44 2017 +0100
cyrus-sasl: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit bd2a7a8fd3ab37d3d2f28a56494e147005902ead
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 16:37:41 2017 +0100
miniupnpd: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 9016d19e0e22c14974f2283c5661f9c2fe17ab6c
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 16:36:36 2017 +0100
minidlna: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 7e8a2556e55f3023e257348dae447321c0034870
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 16:35:36 2017 +0100
miau: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit a5754e5da1830180d488306b10d3688babd6a4b8
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 16:34:09 2017 +0100
cyrus-imapd: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 586761dd73fa21f39b22f0cb8b5d1112cfb7ce64
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 16:32:53 2017 +0100
monit: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit de63e05b49ae04b883e1c5b6d628cd9fba923408
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 16:31:51 2017 +0100
mediatomb: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit dd1884ddb309b2bdee985f0805ab893bac1e45bd
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 15:35:54 2017 +0100
imspector: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit da5c2f96303d544989f39dda6561964578a41034
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 15:18:42 2017 +0100
gnump3d: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 4fa43dd1009a24083db4c8e075ba09d115530c3f
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 15:15:47 2017 +0100
vsftpd: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 9f312b3dde6578c6a3710694ec2e1df3ae677a9a
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 15:12:38 2017 +0100
lcd4linux: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit e5379b19813b57c337b00ac0c37c48ad606854d5
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 15:10:22 2017 +0100
netsnmpd: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 41e5aa4a8809a199dd120cb913270b561bce6a94
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 15:06:55 2017 +0100
dbus: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 112fb61b69f58f23b978cdd2982a57644e8e79dd
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 14:59:58 2017 +0100
lcdproc: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit da6608ef68b8f7beee31a3d957c3e986d4d54a26
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 14:58:49 2017 +0100
vdradmin: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit f09be2a5350b53ec191dcdebe4c105e7835022e5
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 14:57:55 2017 +0100
vdr: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 17f7f41e4147c5653591c1413e576d72461cc1cb
Merge: 7d9b033 5021ee3
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 3 14:56:35 2017 +0100
Merge branch 'next' into initscripts-cleanup
commit 7d9b033b79af8124853a0aac6992389ea8595172
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Mar 1 13:13:36 2017 +0100
sslh: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 896209f6f147d6213fe790c2e6e538440fa66612
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Mar 1 13:11:59 2017 +0100
mpd: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 89760da44254a7eb74ab0cee02c93763a036e50f
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Mar 1 13:10:24 2017 +0100
spamassassin: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 8bcca7ca0a042e94e030f03492becd0026afad02
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Mar 1 13:08:43 2017 +0100
lcr: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 746b72fea87b21ac18730adb20b8d2cf0500a9d8
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Mar 1 13:06:52 2017 +0100
fetchmail: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit ff0f73305cc7ae85cc18b1e3500285c47597bb23
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Mar 1 13:05:55 2017 +0100
rtpproxy: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 76589562ea8921d8d5b5f009f568c67a5be41e7c
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Mar 1 13:04:36 2017 +0100
tftpd: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 06c99e6d4d6e65dea00ea94585a30c08635b29d0
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Sat Feb 25 15:54:55 2017 +0100
postfix: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 2e57eb171395c80658249a476b69a8a4ad21b2e1
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Sat Feb 25 15:49:07 2017 +0100
client175: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 7f328d35400a8612a96eeacc6756187255f329d8
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Sat Feb 25 15:46:58 2017 +0100
amavisd: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit a0851cf32881fecd7b00610c0fc89f46de67d376
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Sat Feb 25 13:02:41 2017 +0100
stunnel: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 87f382731fecd9818bf81e4fae8450107b601cd4
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Sat Feb 25 13:01:08 2017 +0100
cpufrequtils: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 8ab50dba65e02cbfd4edb2ce81e32caef22ff193
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Sat Feb 25 12:59:40 2017 +0100
motion: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 5283818233fe07b1efd52a53b8d894960843629e
Merge: 74eaa64 3a8b6ae
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Sat Feb 25 12:58:27 2017 +0100
Merge branch 'next' into initscripts-cleanup
commit 74eaa64e4ba95d94a387e8756d954a1b5b0f9b13
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Feb 24 19:12:22 2017 +0100
pound: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit dc9baa5496ea41b890927098e222e297e99a1db0
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Feb 24 19:11:00 2017 +0100
transmission: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit f79869bf421437654fde325b4eb262ebe3dbe292
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Feb 24 15:58:01 2017 +0100
apcupsd: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 8fa8cd3b7e10ee7564465de4af60164c32a813ab
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Feb 24 15:56:38 2017 +0100
sane: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 610b34069c6f6ebd857f5cd0c4d3b70e4b4c0143
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Feb 24 15:55:05 2017 +0100
nut: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit e215aaed48d8dfe3c7f6dd2bc649fb5b7547eef3
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Feb 24 15:54:19 2017 +0100
samba: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 939fbafccdacfb0c078daa166829311366257b8c
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Feb 24 12:16:35 2017 +0100
mysql: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 47b6926102a00809aa8929ddd86907aa168850a0
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Feb 24 12:15:23 2017 +0100
keepalived: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit e804a70256d72c7ad76913bde373f2f97f84c21f
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Feb 24 12:14:18 2017 +0100
haproxy: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 5f53bd1c13f6ef6387313768bd8cd250499f66cb
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Feb 24 12:12:52 2017 +0100
bluetooth: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit c5480346b1ace5d630d5a82e73077bd48e9bf42c
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Feb 24 12:11:53 2017 +0100
dnsdist: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit e7301348846afeb0e7f27d801bac2f19763e1c53
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Thu Feb 23 14:32:08 2017 +0100
asterisk: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit ba43a6fee28b7e00c4f5cead38107b3d0300a242
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Thu Feb 23 14:25:06 2017 +0100
guardian: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit df7f06eceb31dc8c0392b84d91dc24756bebe947
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Thu Feb 23 14:23:22 2017 +0100
rpcbind: move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit f22bfcf48c6e3014615254922cb4515afec172a7
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Thu Feb 23 14:21:57 2017 +0100
openvmtools: move initscripts to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit c08b75dbb5fbd3b47adcc0a39bea5d7b1752e948
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 19:51:26 2017 +0100
xinetd: move initscripts to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit dbb35fa6a4c969696411334280d2e688fc79062e
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 19:50:13 2017 +0100
freeradius: move initscripts to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 7db55a67798656f851689863d8401839c8f385a2
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 19:48:38 2017 +0100
tor: move initscripts to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit afb143bd7cd9cdf1c68e33f3f7e2f9cad1900c22
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 17:37:23 2017 +0100
clamav: move initscripts to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit db8a26e71877cc698ead7cc6191a020eaa5648bc
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 16:15:06 2017 +0100
nfs: move initscripts to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 1f68460f5afd37e4a58959a006e09f10fe1c0cff
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 16:11:57 2017 +0100
watchdog: move initscripts to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit c8b7d517d0e687d72bc71816f0f26581a0145edf
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 13:16:12 2017 +0100
Libvirt: move initscripts to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 6a4df2fd3b375c77bbdb99a0bb8b952f7116a3f8
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 13:13:49 2017 +0100
Move initscript to src/initscripts/packages and use new macro
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit be2732c2171613d98f830ef0f6da313424060c3b
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 12:26:54 2017 +0100
Install initscript with the new macro
- Move the cups initscript to src/initscripts/packages
commit 38888b3d927ddd5b47de337cf197494d4a53de7b
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 12:20:09 2017 +0100
Add new make macro for installing initscripts
We also move the initscript for also to src/initscripts/packages
and use this new macro to install the initscript
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 629fcb1d47d686c6182b3ed9e0e49650f40cc6e1
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 11:57:20 2017 +0100
Move network initscripts to src/initscripts/networking
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 33f53d55ccec436a6cbd80ea469ea4a558528798
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 11:54:00 2017 +0100
Move all initscripts for the system to src/initscripts/system
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit c6060f2dcf49f2a20406485d0507cb14a513b44b
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 11:24:00 2017 +0100
Move the initscript of the hostapd package into the packages directory
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit cb144b4f8a854d911401b9ed6d7ef2916eb2dc50
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 11:21:17 2017 +0100
Move the initscripts of the libvirt package into the packages directory
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 1d8dab5404b4e1a662e6f0398a552f8f6251bee6
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 11:18:36 2017 +0100
Move the initscript of the cups package into the packages directory
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 8bc8c282c9b7ef2280e7102e2824047975a9bb4c
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Feb 22 10:23:10 2017 +0100
Move all Initscripts of the system, into an extra directory
Till now all init scripts going into src/initscripts/init.d so they are
installed by the lfs file initscripts. Because of that they also appear
in the rootfile of the "package" initscripts.
This has some disadvantages:
- the initscripts of the packages appear in the 3 rootfiles (one for
each arch) which are annoying because for every package with an
initscript 4 rootfiles (the 3 of the initscript package + the rootfile
of the package) are important.
- The rootfiles for a package are installed by lfs/initscripts but this
should happen only in the build of the package
To solve this issues all rootfiles for the core system are moved into
src/initscripts/init.d/common. Only the initscript in this directory are
installed by lfs/initscripts. So all initscripts for packages are
located in src/initscripts/init.d and are not installed by
lfs/initscripts.
So only the initscripts of the system appear in the 3 rootfiles of the
initscripts package. The initscript of a package appear only in the
rootfile of the package. This makes the maintaining of initscript
easier.
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/armv5tel/initscripts | 56 ---------------------
config/rootfiles/common/i586/initscripts | 57 ----------------------
config/rootfiles/common/x86_64/initscripts | 57 ----------------------
lfs/Config | 7 +++
lfs/alsa | 2 +
lfs/amavisd | 4 ++
lfs/apcupsd | 4 ++
lfs/asterisk | 3 ++
lfs/bluetooth | 4 ++
lfs/clamav | 3 +-
lfs/client175 | 4 ++
lfs/cpufrequtils | 4 ++
lfs/cups | 3 +-
lfs/cyrus-imapd | 4 ++
lfs/cyrus-sasl | 4 ++
lfs/dbus | 4 ++
lfs/dnsdist | 4 ++
lfs/fetchmail | 4 ++
lfs/freeradius | 3 ++
lfs/gnump3d | 4 ++
lfs/guardian | 3 ++
lfs/haproxy | 5 +-
lfs/hostapd | 2 +
lfs/imspector | 3 ++
lfs/initscripts | 8 +--
lfs/keepalived | 6 +--
lfs/lcd4linux | 4 ++
lfs/lcdproc | 4 ++
lfs/lcr | 3 ++
lfs/libvirt | 5 +-
lfs/mediatomb | 4 ++
lfs/miau | 4 ++
lfs/minidlna | 4 ++
lfs/miniupnpd | 3 ++
lfs/monit | 3 ++
lfs/motion | 3 ++
lfs/mpd | 4 ++
lfs/mysql | 4 ++
lfs/netsnmpd | 5 +-
lfs/nfs | 2 +
lfs/nut | 4 ++
lfs/openvmtools | 2 +
lfs/postfix | 4 ++
lfs/pound | 4 ++
lfs/rpcbind | 2 +
lfs/rtpproxy | 2 +
lfs/samba | 3 ++
lfs/sane | 4 ++
lfs/spamassassin | 4 ++
lfs/sslh | 4 ++
lfs/strongswan | 2 -
lfs/stunnel | 4 ++
lfs/tftpd | 2 +
lfs/tor | 3 ++
lfs/transmission | 3 ++
lfs/vdr | 3 ++
lfs/vdradmin | 4 ++
lfs/vsftpd | 4 ++
lfs/watchdog | 2 +
lfs/xinetd | 4 ++
make.sh | 2 +-
src/initscripts/init.d/applejuice | 53 --------------------
src/initscripts/{init.d => }/networking/any | 0
src/initscripts/{init.d => }/networking/dhcpcd.exe | 0
.../{init.d => }/networking/functions.network | 0
src/initscripts/{init.d => }/networking/red | 0
.../networking/red.down/05-update-dns-forwarders | 0
.../{init.d => }/networking/red.down/10-ipsec | 0
.../{init.d => }/networking/red.down/10-miniupnpd | 0
.../{init.d => }/networking/red.down/10-ovpn | 0
.../networking/red.down/10-static-routes | 0
.../{init.d => }/networking/red.down/20-firewall | 0
.../networking/red.up/01-conntrack-cleanup | 0
.../networking/red.up/05-update-dns-forwarders | 0
.../{init.d => }/networking/red.up/10-miniupnpd | 0
.../{init.d => }/networking/red.up/10-multicast | 0
.../networking/red.up/10-static-routes | 0
.../{init.d => }/networking/red.up/20-firewall | 0
.../{init.d => }/networking/red.up/30-ddns | 0
.../{init.d => }/networking/red.up/35-guardian | 0
.../{init.d => }/networking/red.up/50-ipsec | 0
.../{init.d => }/networking/red.up/50-ovpn | 0
.../{init.d => }/networking/red.up/98-leds | 0
.../{init.d => }/networking/red.up/99-fireinfo | 0
.../networking/red.up/99-geoip-database | 0
.../networking/red.up/99-pakfire-update | 0
.../{init.d => }/networking/wpa_supplicant.exe | 0
src/initscripts/{init.d => packages}/alsa | 0
src/initscripts/{init.d => packages}/amavisd | 0
src/initscripts/{init.d => packages}/apcupsd | 0
src/initscripts/{init.d => packages}/asterisk | 0
src/initscripts/{init.d => packages}/bluetooth | 0
src/initscripts/{init.d => packages}/clamav | 0
src/initscripts/{init.d => packages}/client175 | 0
src/initscripts/{init.d => packages}/cpufreq | 0
src/initscripts/{init.d => packages}/cups | 0
src/initscripts/{init.d => packages}/cyrus-imapd | 0
src/initscripts/{init.d => packages}/cyrus-sasl | 0
src/initscripts/{init.d => packages}/dnsdist | 0
src/initscripts/{init.d => packages}/fetchmail | 0
src/initscripts/{init.d => packages}/freeradius | 0
src/initscripts/{init.d => packages}/gnump3d | 0
src/initscripts/{init.d => packages}/guardian | 0
src/initscripts/{init.d => packages}/haproxy | 0
src/initscripts/{init.d => packages}/hostapd | 0
src/initscripts/{init.d => packages}/imspector | 0
src/initscripts/{init.d => packages}/keepalived | 0
src/initscripts/{init.d => packages}/lcd4linux | 0
src/initscripts/{init.d => packages}/lcdproc | 0
src/initscripts/{init.d => packages}/lcr | 0
src/initscripts/{init.d => packages}/libvirtd | 0
src/initscripts/{init.d => packages}/mediatomb | 0
src/initscripts/{init.d => packages}/messagebus | 0
src/initscripts/{init.d => packages}/miau | 0
src/initscripts/{init.d => packages}/minidlna | 0
src/initscripts/{init.d => packages}/miniupnpd | 0
src/initscripts/{init.d => packages}/monit | 0
src/initscripts/{init.d => packages}/motion | 0
src/initscripts/{init.d => packages}/mpd | 0
src/initscripts/{init.d => packages}/mysql | 0
src/initscripts/{init.d => packages}/netsnmpd | 0
src/initscripts/{init.d => packages}/nfs-server | 0
src/initscripts/{init.d => packages}/nut | 0
src/initscripts/{init.d => packages}/openvmtools | 0
src/initscripts/{init.d => packages}/postfix | 0
src/initscripts/{init.d => packages}/pound | 0
src/initscripts/{init.d => packages}/rpcbind | 0
src/initscripts/{init.d => packages}/rtpproxy | 0
src/initscripts/{init.d => packages}/samba | 0
src/initscripts/{init.d => packages}/sane | 0
src/initscripts/{init.d => packages}/spamassassin | 0
src/initscripts/{init.d => packages}/sslh | 0
src/initscripts/{init.d => packages}/stunnel | 0
src/initscripts/{init.d => packages}/tftpd | 0
src/initscripts/{init.d => packages}/tor | 0
src/initscripts/{init.d => packages}/transmission | 0
src/initscripts/{init.d => packages}/vdr | 0
src/initscripts/{init.d => packages}/vdradmin | 0
src/initscripts/{init.d => packages}/virtlogd | 0
src/initscripts/{init.d => packages}/vsftpd | 0
src/initscripts/{init.d => packages}/watchdog | 0
src/initscripts/{init.d => packages}/xinetd | 0
src/initscripts/{init.d => system}/acpid | 0
src/initscripts/{init.d => system}/apache | 0
src/initscripts/{init.d => system}/beep | 0
src/initscripts/{init.d => system}/checkfs | 0
src/initscripts/{init.d => system}/cleanfs | 0
src/initscripts/{init.d => system}/collectd | 0
src/initscripts/{init.d => system}/connectd | 0
src/initscripts/{init.d => system}/console | 0
src/initscripts/{init.d => system}/dhcp | 0
src/initscripts/{init.d => system}/dhcrelay | 0
src/initscripts/{init.d => system}/fcron | 0
src/initscripts/{init.d => system}/fireinfo | 0
src/initscripts/{init.d => system}/firewall | 0
src/initscripts/{init.d => system}/firstsetup | 0
src/initscripts/{init.d => system}/fsresize | 0
src/initscripts/{init.d => system}/functions | 0
src/initscripts/{init.d => system}/halt | 0
src/initscripts/{init.d => system}/ipsec | 0
src/initscripts/{init.d => system}/leds | 0
src/initscripts/{init.d => system}/localnet | 0
src/initscripts/{init.d => system}/mISDN | 0
src/initscripts/{init.d => system}/modules | 0
src/initscripts/{init.d => system}/mountfs | 0
src/initscripts/{init.d => system}/mountkernfs | 0
src/initscripts/{init.d => system}/mounttmpfs | 0
src/initscripts/{init.d => system}/network | 0
src/initscripts/{init.d => system}/network-trigger | 0
src/initscripts/{init.d => system}/ntp | 0
src/initscripts/{init.d => system}/partresize | 0
src/initscripts/{init.d => system}/random | 0
src/initscripts/{init.d => system}/rc | 0
src/initscripts/{init.d => system}/reboot | 0
src/initscripts/{init.d => system}/rngd | 0
src/initscripts/{init.d => system}/sendsignals | 0
src/initscripts/{init.d => system}/setclock | 0
src/initscripts/{init.d => system}/smartenabler | 0
src/initscripts/{init.d => system}/snort | 0
src/initscripts/{init.d => system}/squid | 0
src/initscripts/{init.d => system}/sshd | 0
src/initscripts/{init.d => system}/static-routes | 0
src/initscripts/{init.d => system}/swap | 0
src/initscripts/{init.d => system}/swconfig | 0
src/initscripts/{init.d => system}/sysctl | 0
src/initscripts/{init.d => system}/sysklogd | 0
src/initscripts/{init.d => system}/template | 0
src/initscripts/{init.d => system}/udev | 0
src/initscripts/{init.d => system}/udev_retry | 0
src/initscripts/{init.d => system}/unbound | 0
src/initscripts/{init.d => system}/upnpd | 0
src/initscripts/{init.d => system}/vnstat | 0
src/initscripts/{init.d => system}/waitdrives | 0
src/initscripts/{init.d => system}/wlanclient | 0
194 files changed, 192 insertions(+), 241 deletions(-)
delete mode 100644 src/initscripts/init.d/applejuice
rename src/initscripts/{init.d => }/networking/any (100%)
rename src/initscripts/{init.d => }/networking/dhcpcd.exe (100%)
rename src/initscripts/{init.d => }/networking/functions.network (100%)
rename src/initscripts/{init.d => }/networking/red (100%)
rename src/initscripts/{init.d => }/networking/red.down/05-update-dns-forwarders (100%)
rename src/initscripts/{init.d => }/networking/red.down/10-ipsec (100%)
rename src/initscripts/{init.d => }/networking/red.down/10-miniupnpd (100%)
rename src/initscripts/{init.d => }/networking/red.down/10-ovpn (100%)
rename src/initscripts/{init.d => }/networking/red.down/10-static-routes (100%)
rename src/initscripts/{init.d => }/networking/red.down/20-firewall (100%)
rename src/initscripts/{init.d => }/networking/red.up/01-conntrack-cleanup (100%)
rename src/initscripts/{init.d => }/networking/red.up/05-update-dns-forwarders (100%)
rename src/initscripts/{init.d => }/networking/red.up/10-miniupnpd (100%)
rename src/initscripts/{init.d => }/networking/red.up/10-multicast (100%)
rename src/initscripts/{init.d => }/networking/red.up/10-static-routes (100%)
rename src/initscripts/{init.d => }/networking/red.up/20-firewall (100%)
rename src/initscripts/{init.d => }/networking/red.up/30-ddns (100%)
rename src/initscripts/{init.d => }/networking/red.up/35-guardian (100%)
rename src/initscripts/{init.d => }/networking/red.up/50-ipsec (100%)
rename src/initscripts/{init.d => }/networking/red.up/50-ovpn (100%)
rename src/initscripts/{init.d => }/networking/red.up/98-leds (100%)
rename src/initscripts/{init.d => }/networking/red.up/99-fireinfo (100%)
rename src/initscripts/{init.d => }/networking/red.up/99-geoip-database (100%)
rename src/initscripts/{init.d => }/networking/red.up/99-pakfire-update (100%)
rename src/initscripts/{init.d => }/networking/wpa_supplicant.exe (100%)
rename src/initscripts/{init.d => packages}/alsa (100%)
rename src/initscripts/{init.d => packages}/amavisd (100%)
rename src/initscripts/{init.d => packages}/apcupsd (100%)
rename src/initscripts/{init.d => packages}/asterisk (100%)
rename src/initscripts/{init.d => packages}/bluetooth (100%)
rename src/initscripts/{init.d => packages}/clamav (100%)
rename src/initscripts/{init.d => packages}/client175 (100%)
rename src/initscripts/{init.d => packages}/cpufreq (100%)
rename src/initscripts/{init.d => packages}/cups (100%)
rename src/initscripts/{init.d => packages}/cyrus-imapd (100%)
rename src/initscripts/{init.d => packages}/cyrus-sasl (100%)
rename src/initscripts/{init.d => packages}/dnsdist (100%)
rename src/initscripts/{init.d => packages}/fetchmail (100%)
rename src/initscripts/{init.d => packages}/freeradius (100%)
rename src/initscripts/{init.d => packages}/gnump3d (100%)
rename src/initscripts/{init.d => packages}/guardian (100%)
rename src/initscripts/{init.d => packages}/haproxy (100%)
rename src/initscripts/{init.d => packages}/hostapd (100%)
rename src/initscripts/{init.d => packages}/imspector (100%)
rename src/initscripts/{init.d => packages}/keepalived (100%)
rename src/initscripts/{init.d => packages}/lcd4linux (100%)
rename src/initscripts/{init.d => packages}/lcdproc (100%)
rename src/initscripts/{init.d => packages}/lcr (100%)
rename src/initscripts/{init.d => packages}/libvirtd (100%)
rename src/initscripts/{init.d => packages}/mediatomb (100%)
rename src/initscripts/{init.d => packages}/messagebus (100%)
rename src/initscripts/{init.d => packages}/miau (100%)
rename src/initscripts/{init.d => packages}/minidlna (100%)
rename src/initscripts/{init.d => packages}/miniupnpd (100%)
rename src/initscripts/{init.d => packages}/monit (100%)
rename src/initscripts/{init.d => packages}/motion (100%)
rename src/initscripts/{init.d => packages}/mpd (100%)
rename src/initscripts/{init.d => packages}/mysql (100%)
rename src/initscripts/{init.d => packages}/netsnmpd (100%)
rename src/initscripts/{init.d => packages}/nfs-server (100%)
rename src/initscripts/{init.d => packages}/nut (100%)
rename src/initscripts/{init.d => packages}/openvmtools (100%)
rename src/initscripts/{init.d => packages}/postfix (100%)
rename src/initscripts/{init.d => packages}/pound (100%)
rename src/initscripts/{init.d => packages}/rpcbind (100%)
rename src/initscripts/{init.d => packages}/rtpproxy (100%)
rename src/initscripts/{init.d => packages}/samba (100%)
rename src/initscripts/{init.d => packages}/sane (100%)
rename src/initscripts/{init.d => packages}/spamassassin (100%)
rename src/initscripts/{init.d => packages}/sslh (100%)
rename src/initscripts/{init.d => packages}/stunnel (100%)
rename src/initscripts/{init.d => packages}/tftpd (100%)
rename src/initscripts/{init.d => packages}/tor (100%)
rename src/initscripts/{init.d => packages}/transmission (100%)
rename src/initscripts/{init.d => packages}/vdr (100%)
rename src/initscripts/{init.d => packages}/vdradmin (100%)
rename src/initscripts/{init.d => packages}/virtlogd (100%)
rename src/initscripts/{init.d => packages}/vsftpd (100%)
rename src/initscripts/{init.d => packages}/watchdog (100%)
rename src/initscripts/{init.d => packages}/xinetd (100%)
rename src/initscripts/{init.d => system}/acpid (100%)
rename src/initscripts/{init.d => system}/apache (100%)
rename src/initscripts/{init.d => system}/beep (100%)
rename src/initscripts/{init.d => system}/checkfs (100%)
rename src/initscripts/{init.d => system}/cleanfs (100%)
rename src/initscripts/{init.d => system}/collectd (100%)
rename src/initscripts/{init.d => system}/connectd (100%)
rename src/initscripts/{init.d => system}/console (100%)
rename src/initscripts/{init.d => system}/dhcp (100%)
rename src/initscripts/{init.d => system}/dhcrelay (100%)
rename src/initscripts/{init.d => system}/fcron (100%)
rename src/initscripts/{init.d => system}/fireinfo (100%)
rename src/initscripts/{init.d => system}/firewall (100%)
rename src/initscripts/{init.d => system}/firstsetup (100%)
rename src/initscripts/{init.d => system}/fsresize (100%)
rename src/initscripts/{init.d => system}/functions (100%)
rename src/initscripts/{init.d => system}/halt (100%)
rename src/initscripts/{init.d => system}/ipsec (100%)
rename src/initscripts/{init.d => system}/leds (100%)
rename src/initscripts/{init.d => system}/localnet (100%)
rename src/initscripts/{init.d => system}/mISDN (100%)
rename src/initscripts/{init.d => system}/modules (100%)
rename src/initscripts/{init.d => system}/mountfs (100%)
rename src/initscripts/{init.d => system}/mountkernfs (100%)
rename src/initscripts/{init.d => system}/mounttmpfs (100%)
rename src/initscripts/{init.d => system}/network (100%)
rename src/initscripts/{init.d => system}/network-trigger (100%)
rename src/initscripts/{init.d => system}/ntp (100%)
rename src/initscripts/{init.d => system}/partresize (100%)
rename src/initscripts/{init.d => system}/random (100%)
rename src/initscripts/{init.d => system}/rc (100%)
rename src/initscripts/{init.d => system}/reboot (100%)
rename src/initscripts/{init.d => system}/rngd (100%)
rename src/initscripts/{init.d => system}/sendsignals (100%)
rename src/initscripts/{init.d => system}/setclock (100%)
rename src/initscripts/{init.d => system}/smartenabler (100%)
rename src/initscripts/{init.d => system}/snort (100%)
rename src/initscripts/{init.d => system}/squid (100%)
rename src/initscripts/{init.d => system}/sshd (100%)
rename src/initscripts/{init.d => system}/static-routes (100%)
rename src/initscripts/{init.d => system}/swap (100%)
rename src/initscripts/{init.d => system}/swconfig (100%)
rename src/initscripts/{init.d => system}/sysctl (100%)
rename src/initscripts/{init.d => system}/sysklogd (100%)
rename src/initscripts/{init.d => system}/template (100%)
rename src/initscripts/{init.d => system}/udev (100%)
rename src/initscripts/{init.d => system}/udev_retry (100%)
rename src/initscripts/{init.d => system}/unbound (100%)
rename src/initscripts/{init.d => system}/upnpd (100%)
rename src/initscripts/{init.d => system}/vnstat (100%)
rename src/initscripts/{init.d => system}/waitdrives (100%)
rename src/initscripts/{init.d => system}/wlanclient (100%)
Difference in files:
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index e1e78dc..1e67c36 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -3,65 +3,30 @@ etc/init.d
#etc/rc.d/helper
etc/rc.d/helper/getdnsfromdhcpc.pl
#etc/rc.d/init.d
-#etc/rc.d/init.d/alsa
-#etc/rc.d/init.d/amavisd
etc/rc.d/init.d/apache
-#etc/rc.d/init.d/apcupsd
-#etc/rc.d/init.d/applejuice
-#etc/rc.d/init.d/asterisk
etc/rc.d/init.d/beep
-#etc/rc.d/init.d/bluetooth
etc/rc.d/init.d/checkfs
-#etc/rc.d/init.d/clamav
etc/rc.d/init.d/cleanfs
-#etc/rc.d/init.d/client175
etc/rc.d/init.d/collectd
etc/rc.d/init.d/connectd
etc/rc.d/init.d/console
-#etc/rc.d/init.d/cpufreq
-#etc/rc.d/init.d/cups
-#etc/rc.d/init.d/cyrus-imapd
-#etc/rc.d/init.d/cyrus-sasl
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
-#etc/rc.d/init.d/dnsdist
etc/rc.d/init.d/fcron
-#etc/rc.d/init.d/fetchmail
etc/rc.d/init.d/fireinfo
etc/rc.d/init.d/firewall
etc/rc.d/init.d/firstsetup
-#etc/rc.d/init.d/freeradius
etc/rc.d/init.d/fsresize
etc/rc.d/init.d/functions
-#etc/rc.d/init.d/gnump3d
-#etc/rc.d/init.d/guardian
etc/rc.d/init.d/halt
-#etc/rc.d/init.d/haproxy
-#etc/rc.d/init.d/hostapd
-#etc/rc.d/init.d/imspector
etc/rc.d/init.d/ipsec
-#etc/rc.d/init.d/keepalived
-#etc/rc.d/init.d/lcd4linux
-#etc/rc.d/init.d/lcdproc
-#etc/rc.d/init.d/lcr
etc/rc.d/init.d/leds
-#etc/rc.d/init.d/libvirtd
etc/rc.d/init.d/localnet
etc/rc.d/init.d/mISDN
-#etc/rc.d/init.d/mediatomb
-#etc/rc.d/init.d/messagebus
-#etc/rc.d/init.d/miau
-#etc/rc.d/init.d/minidlna
-#etc/rc.d/init.d/miniupnpd
etc/rc.d/init.d/modules
-#etc/rc.d/init.d/monit
-#etc/rc.d/init.d/motion
etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
-#etc/rc.d/init.d/mpd
-#etc/rc.d/init.d/mysql
-#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-trigger
#etc/rc.d/init.d/networking
@@ -98,52 +63,31 @@ etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-geoip-database
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe
-#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
-#etc/rc.d/init.d/nut
-#etc/rc.d/init.d/openvmtools
etc/rc.d/init.d/partresize
-#etc/rc.d/init.d/postfix
-#etc/rc.d/init.d/pound
etc/rc.d/init.d/random
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
-#etc/rc.d/init.d/rpcbind
-#etc/rc.d/init.d/rtpproxy
-#etc/rc.d/init.d/samba
-#etc/rc.d/init.d/sane
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
etc/rc.d/init.d/snort
-#etc/rc.d/init.d/spamassassin
etc/rc.d/init.d/squid
etc/rc.d/init.d/sshd
-#etc/rc.d/init.d/sslh
etc/rc.d/init.d/static-routes
-#etc/rc.d/init.d/stunnel
etc/rc.d/init.d/swap
etc/rc.d/init.d/swconfig
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd
etc/rc.d/init.d/template
-#etc/rc.d/init.d/tftpd
-#etc/rc.d/init.d/tor
-#etc/rc.d/init.d/transmission
etc/rc.d/init.d/udev
etc/rc.d/init.d/udev_retry
etc/rc.d/init.d/unbound
etc/rc.d/init.d/upnpd
-#etc/rc.d/init.d/vdr
-#etc/rc.d/init.d/vdradmin
-#etc/rc.d/init.d/virtlogd
etc/rc.d/init.d/vnstat
-#etc/rc.d/init.d/vsftpd
etc/rc.d/init.d/waitdrives
-#etc/rc.d/init.d/watchdog
etc/rc.d/init.d/wlanclient
-#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 75aad17..760a128 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -4,66 +4,30 @@ etc/init.d
etc/rc.d/helper/getdnsfromdhcpc.pl
#etc/rc.d/init.d
etc/rc.d/init.d/acpid
-#etc/rc.d/init.d/alsa
-#etc/rc.d/init.d/amavisd
etc/rc.d/init.d/apache
-#etc/rc.d/init.d/apcupsd
-#etc/rc.d/init.d/applejuice
-#etc/rc.d/init.d/asterisk
etc/rc.d/init.d/beep
-#etc/rc.d/init.d/bluetooth
etc/rc.d/init.d/checkfs
-#etc/rc.d/init.d/clamav
etc/rc.d/init.d/cleanfs
-#etc/rc.d/init.d/client175
etc/rc.d/init.d/collectd
etc/rc.d/init.d/connectd
etc/rc.d/init.d/console
-#etc/rc.d/init.d/cpufreq
-#etc/rc.d/init.d/cups
-#etc/rc.d/init.d/cyrus-imapd
-#etc/rc.d/init.d/cyrus-sasl
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
-#etc/rc.d/init.d/dnsdist
etc/rc.d/init.d/fcron
-#etc/rc.d/init.d/fetchmail
etc/rc.d/init.d/fireinfo
etc/rc.d/init.d/firewall
etc/rc.d/init.d/firstsetup
-#etc/rc.d/init.d/freeradius
etc/rc.d/init.d/fsresize
etc/rc.d/init.d/functions
-#etc/rc.d/init.d/gnump3d
-#etc/rc.d/init.d/guardian
etc/rc.d/init.d/halt
-#etc/rc.d/init.d/haproxy
-#etc/rc.d/init.d/hostapd
-#etc/rc.d/init.d/imspector
etc/rc.d/init.d/ipsec
-#etc/rc.d/init.d/keepalived
-#etc/rc.d/init.d/lcd4linux
-#etc/rc.d/init.d/lcdproc
-#etc/rc.d/init.d/lcr
etc/rc.d/init.d/leds
-#etc/rc.d/init.d/libvirt-guests
-#etc/rc.d/init.d/libvirtd
etc/rc.d/init.d/localnet
etc/rc.d/init.d/mISDN
-#etc/rc.d/init.d/mediatomb
-#etc/rc.d/init.d/messagebus
-#etc/rc.d/init.d/miau
-#etc/rc.d/init.d/minidlna
-#etc/rc.d/init.d/miniupnpd
etc/rc.d/init.d/modules
-#etc/rc.d/init.d/monit
-#etc/rc.d/init.d/motion
etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
-#etc/rc.d/init.d/mpd
-#etc/rc.d/init.d/mysql
-#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-trigger
#etc/rc.d/init.d/networking
@@ -100,51 +64,30 @@ etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-geoip-database
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe
-#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
-#etc/rc.d/init.d/nut
-#etc/rc.d/init.d/openvmtools
etc/rc.d/init.d/partresize
-#etc/rc.d/init.d/postfix
-#etc/rc.d/init.d/pound
etc/rc.d/init.d/random
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
-#etc/rc.d/init.d/rpcbind
-#etc/rc.d/init.d/rtpproxy
-#etc/rc.d/init.d/samba
-#etc/rc.d/init.d/sane
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
etc/rc.d/init.d/snort
-#etc/rc.d/init.d/spamassassin
etc/rc.d/init.d/squid
etc/rc.d/init.d/sshd
-#etc/rc.d/init.d/sslh
etc/rc.d/init.d/static-routes
-#etc/rc.d/init.d/stunnel
etc/rc.d/init.d/swap
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd
etc/rc.d/init.d/template
-#etc/rc.d/init.d/tftpd
-#etc/rc.d/init.d/tor
-#etc/rc.d/init.d/transmission
etc/rc.d/init.d/udev
etc/rc.d/init.d/udev_retry
etc/rc.d/init.d/unbound
etc/rc.d/init.d/upnpd
-#etc/rc.d/init.d/vdr
-#etc/rc.d/init.d/vdradmin
-#etc/rc.d/init.d/virtlogd
etc/rc.d/init.d/vnstat
-#etc/rc.d/init.d/vsftpd
etc/rc.d/init.d/waitdrives
-#etc/rc.d/init.d/watchdog
etc/rc.d/init.d/wlanclient
-#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 75aad17..760a128 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -4,66 +4,30 @@ etc/init.d
etc/rc.d/helper/getdnsfromdhcpc.pl
#etc/rc.d/init.d
etc/rc.d/init.d/acpid
-#etc/rc.d/init.d/alsa
-#etc/rc.d/init.d/amavisd
etc/rc.d/init.d/apache
-#etc/rc.d/init.d/apcupsd
-#etc/rc.d/init.d/applejuice
-#etc/rc.d/init.d/asterisk
etc/rc.d/init.d/beep
-#etc/rc.d/init.d/bluetooth
etc/rc.d/init.d/checkfs
-#etc/rc.d/init.d/clamav
etc/rc.d/init.d/cleanfs
-#etc/rc.d/init.d/client175
etc/rc.d/init.d/collectd
etc/rc.d/init.d/connectd
etc/rc.d/init.d/console
-#etc/rc.d/init.d/cpufreq
-#etc/rc.d/init.d/cups
-#etc/rc.d/init.d/cyrus-imapd
-#etc/rc.d/init.d/cyrus-sasl
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
-#etc/rc.d/init.d/dnsdist
etc/rc.d/init.d/fcron
-#etc/rc.d/init.d/fetchmail
etc/rc.d/init.d/fireinfo
etc/rc.d/init.d/firewall
etc/rc.d/init.d/firstsetup
-#etc/rc.d/init.d/freeradius
etc/rc.d/init.d/fsresize
etc/rc.d/init.d/functions
-#etc/rc.d/init.d/gnump3d
-#etc/rc.d/init.d/guardian
etc/rc.d/init.d/halt
-#etc/rc.d/init.d/haproxy
-#etc/rc.d/init.d/hostapd
-#etc/rc.d/init.d/imspector
etc/rc.d/init.d/ipsec
-#etc/rc.d/init.d/keepalived
-#etc/rc.d/init.d/lcd4linux
-#etc/rc.d/init.d/lcdproc
-#etc/rc.d/init.d/lcr
etc/rc.d/init.d/leds
-#etc/rc.d/init.d/libvirt-guests
-#etc/rc.d/init.d/libvirtd
etc/rc.d/init.d/localnet
etc/rc.d/init.d/mISDN
-#etc/rc.d/init.d/mediatomb
-#etc/rc.d/init.d/messagebus
-#etc/rc.d/init.d/miau
-#etc/rc.d/init.d/minidlna
-#etc/rc.d/init.d/miniupnpd
etc/rc.d/init.d/modules
-#etc/rc.d/init.d/monit
-#etc/rc.d/init.d/motion
etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
-#etc/rc.d/init.d/mpd
-#etc/rc.d/init.d/mysql
-#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-trigger
#etc/rc.d/init.d/networking
@@ -100,51 +64,30 @@ etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-geoip-database
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe
-#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
-#etc/rc.d/init.d/nut
-#etc/rc.d/init.d/openvmtools
etc/rc.d/init.d/partresize
-#etc/rc.d/init.d/postfix
-#etc/rc.d/init.d/pound
etc/rc.d/init.d/random
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
-#etc/rc.d/init.d/rpcbind
-#etc/rc.d/init.d/rtpproxy
-#etc/rc.d/init.d/samba
-#etc/rc.d/init.d/sane
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
etc/rc.d/init.d/snort
-#etc/rc.d/init.d/spamassassin
etc/rc.d/init.d/squid
etc/rc.d/init.d/sshd
-#etc/rc.d/init.d/sslh
etc/rc.d/init.d/static-routes
-#etc/rc.d/init.d/stunnel
etc/rc.d/init.d/swap
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd
etc/rc.d/init.d/template
-#etc/rc.d/init.d/tftpd
-#etc/rc.d/init.d/tor
-#etc/rc.d/init.d/transmission
etc/rc.d/init.d/udev
etc/rc.d/init.d/udev_retry
etc/rc.d/init.d/unbound
etc/rc.d/init.d/upnpd
-#etc/rc.d/init.d/vdr
-#etc/rc.d/init.d/vdradmin
-#etc/rc.d/init.d/virtlogd
etc/rc.d/init.d/vnstat
-#etc/rc.d/init.d/vsftpd
etc/rc.d/init.d/waitdrives
-#etc/rc.d/init.d/watchdog
etc/rc.d/init.d/wlanclient
-#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion
diff --git a/lfs/Config b/lfs/Config
index 4de8bd3..3101d8b 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -206,3 +206,10 @@ define PAK
-e s/SIZE/`ls -l \/install\/packages\/$(PROG)-$(VER)-$(PAK_VER).ipfire | awk '{ print $$5 }'`/g \
< /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG)
endef
+
+define INSTALL_INITSCRIPT
+ install -m 754 -v $(DIR_SRC)/src/initscripts/packages/$(1) /etc/rc.d/init.d/$(1)
+endef
+
+test:
+ $(call INSTALL_INITSCRIPT,hostapd)
diff --git a/lfs/alsa b/lfs/alsa
index b9c3bb4..72ea70d 100644
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -99,5 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_SRC)/alsa-firmware-$(FVER) && ./configure
cd $(DIR_SRC)/alsa-firmware-$(FVER) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_SRC)/alsa-firmware-$(FVER) && make install
+ # install initscript
+ $(call INSTALL_INITSCRIPT,alsa)
@rm -rf $(DIR_SRC)/alsa*
@$(POSTBUILD)
diff --git a/lfs/amavisd b/lfs/amavisd
index 39464e4..7230c0c 100644
--- a/lfs/amavisd
+++ b/lfs/amavisd
@@ -80,6 +80,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && cp -f amavisd /usr/bin
chown root.root /usr/bin/amavisd
chmod 755 /usr/bin/amavisd
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,amavisd)
+
cp -fv $(DIR_SRC)/config/amavisd/amavisd.conf /etc
chown root.root /etc/amavisd.conf
chmod 644 /etc/amavisd.conf
diff --git a/lfs/apcupsd b/lfs/apcupsd
index 4e9137b..1d8e0ff 100644
--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -81,6 +81,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--with-cgi-bin=/srv/web/ipfire/cgi-bin
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,apcupsd)
+
ln -sf ../init.d/apcupsd /etc/rc.d/rc3.d/S65apcupsd
ln -sf ../init.d/apcupsd /etc/rc.d/rc0.d/K35apcupsd
ln -sf ../init.d/apcupsd /etc/rc.d/rc6.d/K35apcupsd
diff --git a/lfs/asterisk b/lfs/asterisk
index a0276bc..31f6ec0 100755
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -152,6 +152,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# generate softlink (or asterisk will not work properly)
ln -sf /var/ipfire/asterisk /etc/asterisk
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,asterisk)
+
# make asterisk start with reboot
ln -sf /etc/rc.d/init.d/asterisk /etc/rc.d/rc0.d/K30asterisk
ln -sf /etc/rc.d/init.d/asterisk /etc/rc.d/rc6.d/K30asterisk
diff --git a/lfs/bluetooth b/lfs/bluetooth
index dc5eec7..2c57809 100644
--- a/lfs/bluetooth
+++ b/lfs/bluetooth
@@ -125,5 +125,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chown nobody:nobody /var/ipfire/bluetooth/settings
chmod 644 /var/ipfire/bluetooth/settings
install -v -m 644 $(DIR_SRC)/config/backup/includes/bluetooth /var/ipfire/backup/addons/includes/bluetooth
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,bluetooth)
+
@rm -rf $(DIR_SRC)/bluez*
@$(POSTBUILD)
diff --git a/lfs/clamav b/lfs/clamav
index 2cd5e49..650faec 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -95,7 +95,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
rm -rfv /usr/share/clamav/*.cvd
mkdir -p /var/run/clamav
chown clamav:clamav /var/run/clamav
-
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,clamav)
# Disable PaX mprotect for clamd, clamscan and freshclam
paxctl -cm /usr/sbin/clamd
paxctl -cm /usr/bin/clamscan
diff --git a/lfs/client175 b/lfs/client175
index ef2b487..cc462d0 100644
--- a/lfs/client175
+++ b/lfs/client175
@@ -89,5 +89,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
/var/ipfire/backup/addons/includes/client175
chown -R nobody:nobody /srv/client175
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,client175)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/cpufrequtils b/lfs/cpufrequtils
index 5a82c33..d558efa 100644
--- a/lfs/cpufrequtils
+++ b/lfs/cpufrequtils
@@ -82,5 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,cpufreq)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/cups b/lfs/cups
index 9a7e606..47f71f8 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -93,7 +93,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
- install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/cups /etc/rc.d/init.d
+ # install initscript
+ $(call INSTALL_INITSCRIPT,cups)
cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/
@rm -rf $(DIR_APP)
diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index f4c855c..e6452ae 100644
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -105,5 +105,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chown cyrus.mail /var/imap/socket
install -v -m 644 $(DIR_SRC)/config/backup/includes/cyrus-imapd \
/var/ipfire/backup/addons/includes/cyrus-imapd
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,cyrus-imapd)
+
@rm -rf $(DIR_APP) /usr/include/com_err.h
@$(POSTBUILD)
diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index 84f49d9..757f742 100644
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -96,6 +96,10 @@ ifeq "$(PASS)" ""
install -v -m700 -d /var/lib/sasl
-mkdir /var/run/saslauthd
cp -vf $(DIR_SRC)/config/cyrus-sasl/smtpd.conf /usr/lib/sasl2/
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,cyrus-sasl)
+
else
# WITH LDAP SUPPORT AT THIS TIME
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
diff --git a/lfs/dbus b/lfs/dbus
index 3a43106..fdbad47 100644
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -82,5 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--localstatedir=/var
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,messagebus)
+
@rm -rf $(DIR_SRC)/dbus*
@$(POSTBUILD)
diff --git a/lfs/dnsdist b/lfs/dnsdist
index a5d9fea..aeb11c8 100644
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -81,6 +81,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,dnsdist)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/fetchmail b/lfs/fetchmail
index 66b9a65..ab271b0 100644
--- a/lfs/fetchmail
+++ b/lfs/fetchmail
@@ -96,5 +96,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/backup/includes/fetchmail \
/var/ipfire/backup/addons/includes/fetchmail
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,fetchmail)
+
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/freeradius b/lfs/freeradius
index d9a80c6..a07a535 100644
--- a/lfs/freeradius
+++ b/lfs/freeradius
@@ -133,5 +133,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/backup/includes/freeradius \
/var/ipfire/backup/addons/includes/freeradius
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,freeradius)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/gnump3d b/lfs/gnump3d
index ca14c27..0022b4e 100644
--- a/lfs/gnump3d
+++ b/lfs/gnump3d
@@ -91,5 +91,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chown nobody.nobody /var/mp3
install -m 644 $(DIR_SRC)/config/gnump3d/gnump3d.conf /etc/gnump3d/
ln -sf /usr/bin/gnump3d-index /etc/fcron.daily/gnump3d-index
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,gnump3d)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/guardian b/lfs/guardian
index d363419..2120a08 100644
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -93,6 +93,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-mkdir -pv /var/log/guardian
touch /var/log/guardian/guardian.log
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,guardian)
+
# Create symlinks for runlevel interaction.
ln -svf /etc/rc.d/init.d/guardian /etc/rc.d/rc3.d/S45guardian
ln -svf /etc/rc.d/init.d/guardian /etc/rc.d/rc0.d/K76guardian
diff --git a/lfs/haproxy b/lfs/haproxy
index 4af2273..0e5a067 100644
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -91,9 +91,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/backup/includes/haproxy \
/var/ipfire/backup/addons/includes/haproxy
- # Restore initscript
- install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/haproxy \
- /etc/rc.d/init.d/haproxy
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,haproxy)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/hostapd b/lfs/hostapd
index a4fe99a..1a2436c 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -83,6 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP)/hostapd && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP)/hostapd && make install
install -v -m 644 $(DIR_SRC)/config/backup/includes/hostapd /var/ipfire/backup/addons/includes/hostapd
+ # install initscript
+ $(call INSTALL_INITSCRIPT,hostapd)
mkdir -p /var/ipfire/wlanap
touch /var/ipfire/wlanap/settings
cp -vrf $(DIR_SRC)/config/hostapd/hostapd.conf /var/ipfire/wlanap/hostapd.conf
diff --git a/lfs/imspector b/lfs/imspector
index 5cea872..d4aa9b1 100644
--- a/lfs/imspector
+++ b/lfs/imspector
@@ -91,5 +91,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chmod 755 /srv/web/ipfire/cgi-bin/imspector.cgi
chown nobody:nobody -R /var/log/imspector
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,imspector)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/initscripts b/lfs/initscripts
index c5baf68..ef7114c 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -64,22 +64,22 @@ $(TARGET) :
# Create default ramdisk configuration
echo "RAMDISK_MODE=0" > /etc/sysconfig/ramdisk
- for i in $(DIR_SRC)/src/initscripts/init.d/*; do \
+ for i in $(DIR_SRC)/src/initscripts/system/*; do \
install -v -m 754 $$i /etc/rc.d/init.d/; \
done
chmod 644 /etc/rc.d/init.d/functions
- for i in $(DIR_SRC)/src/initscripts/init.d/networking/*; do \
+ for i in $(DIR_SRC)/src/initscripts/networking/*; do \
if [ -f $$i ]; then \
install -v -m 754 $$i /etc/rc.d/init.d/networking/; \
fi; \
done
- for i in $(DIR_SRC)/src/initscripts/init.d/networking/red.up/*; do \
+ for i in $(DIR_SRC)/src/initscripts/networking/red.up/*; do \
install -v -m 754 $$i /etc/rc.d/init.d/networking/red.up/; \
done
- for i in $(DIR_SRC)/src/initscripts/init.d/networking/red.down/*; do \
+ for i in $(DIR_SRC)/src/initscripts/networking/red.down/*; do \
install -v -m 754 $$i /etc/rc.d/init.d/networking/red.down/; \
done
diff --git a/lfs/keepalived b/lfs/keepalived
index 2054a54..257ceb2 100644
--- a/lfs/keepalived
+++ b/lfs/keepalived
@@ -85,8 +85,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/backup/includes/keepalived \
/var/ipfire/backup/addons/includes/keepalived
- # Restore initscript
- install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/keepalived \
- /etc/rc.d/init.d/keepalived
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,keepalived)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/lcd4linux b/lfs/lcd4linux
index a736381..31bcf12 100644
--- a/lfs/lcd4linux
+++ b/lfs/lcd4linux
@@ -80,6 +80,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --with-plugins=all,!qnaplog,!dbus --prefix=/usr
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,lcd4linux)
+
install -v -m 644 $(DIR_SRC)/config/backup/includes/lcd4linux /var/ipfire/backup/addons/includes/lcd4linux
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/lcdproc b/lfs/lcdproc
index 83b2437..e408294 100644
--- a/lfs/lcdproc
+++ b/lfs/lcdproc
@@ -93,6 +93,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make install
-mkdir -pv /etc/lcdproc
cp -vf $(DIR_SRC)/config/lcdproc/{LCDd,lcdproc}.conf /etc/lcdproc
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,lcdproc)
+
ln -sf ../init.d/lcdproc /etc/rc.d/rc3.d/S60lcdproc
ln -sf ../init.d/lcdproc /etc/rc.d/rc0.d/K40lcdproc
ln -sf ../init.d/lcdproc /etc/rc.d/rc6.d/K40lcdproc
diff --git a/lfs/lcr b/lfs/lcr
index 321be97..7ada81d 100644
--- a/lfs/lcr
+++ b/lfs/lcr
@@ -91,5 +91,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
/var/ipfire/lcr/routing.conf
install -v -m 644 $(DIR_SRC)/config/backup/includes/lcr \
/var/ipfire/backup/addons/includes/lcr
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,lcr)
+
@rm -rf $(DIR_SRC)/lcr
@$(POSTBUILD)
diff --git a/lfs/libvirt b/lfs/libvirt
index 996d32e..5a9548d 100644
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -89,8 +89,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--without-storage-scsi --without-storage-mpath --without-storage-disk --without-storage-rbd --without-storage-sheepdog --without-storage-gluster --without-storage-zfs
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
- install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/libvirtd /etc/rc.d/init.d/libvirtd
- install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/virtlogd /etc/rc.d/init.d/virtlogd
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,libvirtd)
+ $(call INSTALL_INITSCRIPT,virtlogd)
mv /usr/libexec/libvirt-guests.sh /etc/rc.d/init.d/libvirt-guests
# Backup
install -v -m 644 $(DIR_SRC)/config/backup/includes/libvirt /var/ipfire/backup/addons/includes/libvirt
diff --git a/lfs/mediatomb b/lfs/mediatomb
index 5811a0a..c36710a 100644
--- a/lfs/mediatomb
+++ b/lfs/mediatomb
@@ -85,5 +85,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/backup/includes/mediatomb \
/var/ipfire/backup/addons/includes/mediatomb
echo Folder for music files > /var/mp3/info
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,mediatomb)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/miau b/lfs/miau
index c3ca754..8106587 100644
--- a/lfs/miau
+++ b/lfs/miau
@@ -85,6 +85,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
mkdir /opt/miau/config
install -v -m 640 $(DIR_SRC)/config/miau/miaurc \
/opt/miau/config/miaurc
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,miau)
+
ln -sf ../init.d/miau /etc/rc.d/rc3.d/S60miau
ln -sf ../init.d/miau /etc/rc.d/rc0.d/K01miau
ln -sf ../init.d/miau /etc/rc.d/rc6.d/K01miau
diff --git a/lfs/minidlna b/lfs/minidlna
index 1c3f61c..3302cdd 100644
--- a/lfs/minidlna
+++ b/lfs/minidlna
@@ -83,5 +83,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Install configuration.
install -m 644 $(DIR_SRC)/config/minidlna/minidlna.conf /etc
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,minidlna)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/miniupnpd b/lfs/miniupnpd
index 18b8c39..0e2c890 100644
--- a/lfs/miniupnpd
+++ b/lfs/miniupnpd
@@ -81,5 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-mkdir -pv /etc/miniupnpd
cp -vf $(DIR_SRC)/config/miniupnpd/miniupnpd.conf /etc/miniupnpd/miniupnpd.conf
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,miniupnpd)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/monit b/lfs/monit
index 2735e15..cfa9699 100644
--- a/lfs/monit
+++ b/lfs/monit
@@ -89,6 +89,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Install default configuration
install -v -m 600 $(DIR_SRC)/config/monit/monitrc /etc
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,monit)
+
# Install start links and backup include file.
ln -sf ../init.d/monit /etc/rc.d/rc3.d/S60monit
ln -sf ../init.d/monit /etc/rc.d/rc0.d/K40monit
diff --git a/lfs/motion b/lfs/motion
index 39c6b73..a091338 100644
--- a/lfs/motion
+++ b/lfs/motion
@@ -91,5 +91,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
#Remove obsolete V4L1 videodev.h
rm -f /usr/include/linux/videodev.h
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,motion)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/mpd b/lfs/mpd
index 7b2c54d..681b5c9 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -86,4 +86,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP)
touch /var/log/mpd.error.log
touch /var/log/mpd.log
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,mpd)
+
@$(POSTBUILD)
diff --git a/lfs/mysql b/lfs/mysql
index edcd651..089516e 100644
--- a/lfs/mysql
+++ b/lfs/mysql
@@ -102,5 +102,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m755 -o mysql -g mysql -d /var/run/mysql
install -v -m 644 $(DIR_SRC)/config/backup/includes/mysql \
/var/ipfire/backup/addons/includes/mysql
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,mysql)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/netsnmpd b/lfs/netsnmpd
index b513678..1e59457 100644
--- a/lfs/netsnmpd
+++ b/lfs/netsnmpd
@@ -90,7 +90,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m644 $(DIR_SRC)/config/netsnmpd/snmpd.conf /etc/snmpd.conf
install -v -m 644 $(DIR_SRC)/config/backup/includes/netsnmpd \
/var/ipfire/backup/addons/includes/netsnmpd
- install -v -m755 $(DIR_SRC)/src/initscripts/init.d/netsnmpd /etc/init.d/netsnmpd
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,netsnmpd)
+
ln -sf ../init.d/netsnmpd /etc/rc.d/rc3.d/S65netsnmpd
ln -sf ../init.d/netsnmpd /etc/rc.d/rc0.d/K02netsnmpd
ln -sf ../init.d/netsnmpd /etc/rc.d/rc6.d/K02netsnmpd
diff --git a/lfs/nfs b/lfs/nfs
index 23a1773..2a8e331 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -98,5 +98,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,nfs-server)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/nut b/lfs/nut
index c64c5a2..2045dce 100644
--- a/lfs/nut
+++ b/lfs/nut
@@ -84,6 +84,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make install
# sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut-usbups.rules
-mkdir -p /var/state/ups
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,nut)
+
install -v -m 644 $(DIR_SRC)/config/backup/includes/nut \
/var/ipfire/backup/addons/includes/nut
@rm -rf $(DIR_APP)
diff --git a/lfs/openvmtools b/lfs/openvmtools
index 72101d5..1cf9427 100644
--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -90,6 +90,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--without-xerces-c --without-xerces
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,openvmtools)
ln -sf ../init.d/openvmtools /etc/rc.d/rc3.d/S60openvmtools
ln -sf ../init.d/openvmtools /etc/rc.d/rc0.d/K01openvmtools
ln -sf ../init.d/openvmtools /etc/rc.d/rc6.d/K01openvmtools
diff --git a/lfs/postfix b/lfs/postfix
index b8029f7..3758b9c 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -116,5 +116,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/backup/includes/postfix \
/var/ipfire/backup/addons/includes/postfix
mv /usr/sbin/sendmail /usr/sbin/sendmail.postfix
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,postfix)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/pound b/lfs/pound
index 3860122..b4206d0 100644
--- a/lfs/pound
+++ b/lfs/pound
@@ -81,6 +81,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--with-dh=1024
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,pound)
+
install -v -m 644 $(DIR_SRC)/config/backup/includes/pound \
/var/ipfire/backup/addons/includes/pound
diff --git a/lfs/rpcbind b/lfs/rpcbind
index e7f9eff..046121f 100644
--- a/lfs/rpcbind
+++ b/lfs/rpcbind
@@ -82,5 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/sbin --with-rpcuser=root --without-systemdsystemunitdir --disable-ipv6
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,rpcbind)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/rtpproxy b/lfs/rtpproxy
index 88715dd..be276c6 100644
--- a/lfs/rtpproxy
+++ b/lfs/rtpproxy
@@ -80,6 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,rtpproxy)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/samba b/lfs/samba
index 74a1b76..076152f 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -136,5 +136,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chmod 750 /var/lib/samba/winbindd_privileged
chgrp wbpriv /var/lib/samba/winbindd_privileged
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,samba)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/sane b/lfs/sane
index 64f3375..9e456f0 100644
--- a/lfs/sane
+++ b/lfs/sane
@@ -85,6 +85,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make install
chmod 4755 /usr/bin/scanimage
cp -vf $(DIR_SRC)/config/sane/saned.conf /etc/sane.d/
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,sane)
+
ln -sf ../init.d/sane /etc/rc.d/rc3.d/S95sane
ln -sf ../init.d/sane /etc/rc.d/rc0.d/K10sane
ln -sf ../init.d/sane /etc/rc.d/rc6.d/K10sane
diff --git a/lfs/spamassassin b/lfs/spamassassin
index 02d60fe..75944a7 100644
--- a/lfs/spamassassin
+++ b/lfs/spamassassin
@@ -80,5 +80,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && yes 'n' | perl Makefile.PL
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,spamassassin)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/sslh b/lfs/sslh
index f4201c3..8262a5f 100644
--- a/lfs/sslh
+++ b/lfs/sslh
@@ -79,5 +79,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(MAKETUNING)
cd $(DIR_APP) && install -v -m 755 sslh /usr/sbin
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,sslh)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/strongswan b/lfs/strongswan
index 9e8f155..0af9e9d 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -108,8 +108,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Remove all library files we don't want or need.
rm -vf /usr/lib/ipsec/plugins/*.{,l}a
- -rm -rfv /etc/rc*.d/*ipsec
- cd $(DIR_SRC) && cp src/initscripts/init.d/ipsec /etc/rc.d/init.d/ipsec
rm -f /etc/ipsec.conf /etc/ipsec.secrets
ln -sf $(CONFIG_ROOT)/vpn/ipsec.conf /etc/ipsec.conf
ln -sf $(CONFIG_ROOT)/vpn/ipsec.secrets /etc/ipsec.secrets
diff --git a/lfs/stunnel b/lfs/stunnel
index 4585151..684e452 100644
--- a/lfs/stunnel
+++ b/lfs/stunnel
@@ -88,6 +88,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m750 -o stunnel -g stunnel -d /var/lib/stunnel/run
chown -v stunnel:stunnel /var/lib/stunnel
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,stunnel)
+
+
# Install default configuration
-mkdir -pv /etc/stunnel
install -v -m 644 $(DIR_SRC)/config/stunnel/stunnel.conf \
diff --git a/lfs/tftpd b/lfs/tftpd
index 2ebf84a..e0cd93b 100644
--- a/lfs/tftpd
+++ b/lfs/tftpd
@@ -81,5 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
mv -fv /usr/sbin/in.tftpd /usr/sbin/tftpd
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,tftpd)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/tor b/lfs/tor
index be812e0..4da2c7c 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -107,6 +107,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/tor/defaults-torrc \
/usr/share/tor/defaults-torrc
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,tor)
+
# Install start links and backup include file.
ln -sf ../init.d/tor /etc/rc.d/rc3.d/S60tor
ln -sf ../init.d/tor /etc/rc.d/rc0.d/K40tor
diff --git a/lfs/transmission b/lfs/transmission
index 36eb3c4..79ebaa1 100644
--- a/lfs/transmission
+++ b/lfs/transmission
@@ -88,6 +88,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cp -vf $(DIR_SRC)/config/transmission/* /etc/transmission/
chown -Rv nobody.nobody /etc/transmission
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,transmission)
+
# Install backup include
install -v -m 644 $(DIR_SRC)/config/backup/includes/transmission \
/var/ipfire/backup/addons/includes/transmission
diff --git a/lfs/vdr b/lfs/vdr
index 52ecdd5..99e8104 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -131,6 +131,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ln -svf ../../include/vdr/config.h /usr/lib/vdr/config.h
ln -svf ../../include/vdr/device.h /usr/lib/vdr/device.h
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,vdr)
+
# Install start links and backup include file.
ln -sf ../init.d/vdr /etc/rc.d/rc3.d/S60vdr
ln -sf ../init.d/vdr /etc/rc.d/rc0.d/K40vdr
diff --git a/lfs/vdradmin b/lfs/vdradmin
index b38ecca..bca5c58 100644
--- a/lfs/vdradmin
+++ b/lfs/vdradmin
@@ -81,6 +81,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
export "LANG=de_DE"
cp $(DIR_SRC)/config/vdradmin/install-ipfire.sh $(DIR_APP)/
cd $(DIR_APP) && ./install-ipfire.sh
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,vdradmin)
+
install -v -m 644 $(DIR_SRC)/config/vdradmin/vdradmind.conf \
/etc/vdradmin/vdradmind.conf
mkdir -pv /var/log/vdradmin
diff --git a/lfs/vsftpd b/lfs/vsftpd
index 7284be9..07dda30 100644
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -87,6 +87,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && install -v -m 644 vsftpd.conf.5 /usr/share/man/man5
cd $(DIR_APP) && install -v -m 644 $(DIR_SRC)/config/vsftpd/vsftpd.conf /etc
cd $(DIR_APP) && install -v -m 644 $(DIR_SRC)/config/vsftpd/vsftpd.user_list /etc
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,vsftpd)
+
ln -sf ../init.d/vsftpd /etc/rc.d/rc3.d/S65vsftpd
ln -sf ../init.d/vsftpd /etc/rc.d/rc0.d/K35vsftpd
ln -sf ../init.d/vsftpd /etc/rc.d/rc6.d/K35vsftpd
diff --git a/lfs/watchdog b/lfs/watchdog
index 70bf692..9bef907 100644
--- a/lfs/watchdog
+++ b/lfs/watchdog
@@ -80,6 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,watchdog)
install -v -m 644 $(DIR_SRC)/config/backup/includes/watchdog \
/var/ipfire/backup/addons/includes/watchdog
@rm -rf $(DIR_APP)
diff --git a/lfs/xinetd b/lfs/xinetd
index 62f34ea..d3b577b 100644
--- a/lfs/xinetd
+++ b/lfs/xinetd
@@ -81,5 +81,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make install
-mkdir -pv /etc/xinetd.d
cp -f $(DIR_SRC)/config/xinetd/xinetd.conf /etc/xinetd.conf
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,nfs-server)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index f5e792a..24ea777 100755
--- a/make.sh
+++ b/make.sh
@@ -393,6 +393,7 @@ buildipfire() {
LOGFILE="$BASEDIR/log/_build.ipfire.log"
export LOGFILE
ipfiremake configroot
+ ipfiremake initscripts
ipfiremake backup
ipfiremake pkg-config
ipfiremake libusb
@@ -563,7 +564,6 @@ buildipfire() {
ipfiremake hdparm
ipfiremake sdparm
ipfiremake mtools
- ipfiremake initscripts
ipfiremake whatmask
ipfiremake conntrack-tools
ipfiremake libupnp
diff --git a/src/initscripts/init.d/applejuice b/src/initscripts/init.d/applejuice
deleted file mode 100644
index d8bbc8c..0000000
--- a/src/initscripts/init.d/applejuice
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/applejuice
-#
-# Description : Applejuice Init script
-#
-# Authors : Michael Tremer - www.ipfire.org
-#
-# Version : 01.00
-#
-# Notes :
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-eval $(/usr/local/bin/readhash /var/ipfire/applejuice/settings)
-
-
-case "${1}" in
- start)
- boot_mesg "Starting Applejuice Core..."
- cd /opt/applejuice
- screen -dmS ajcore /usr/bin/java -Xmx${RAMSIZE} -Djava.library.path=. -jar ajcore.jar
- evaluate_retval
- ;;
-
- stop)
- boot_mesg "Stopping Applejuice Core..."
- killproc /usr/bin/java
- ;;
-
- restart)
- ${0} stop
- sleep 1
- ${0} start
- ;;
-
- status)
- statusproc /usr/bin/java
- ;;
-
- core)
- screen -x ajcore
- ;;
-
- *)
- echo "Usage: ${0} {start|stop|restart|status|core}"
- exit 1
- ;;
-esac
-
-# End $rc_base/init.d/applejuice
diff --git a/src/initscripts/init.d/networking/any b/src/initscripts/networking/any
similarity index 100%
rename from src/initscripts/init.d/networking/any
rename to src/initscripts/networking/any
diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/networking/dhcpcd.exe
similarity index 100%
rename from src/initscripts/init.d/networking/dhcpcd.exe
rename to src/initscripts/networking/dhcpcd.exe
diff --git a/src/initscripts/init.d/networking/functions.network b/src/initscripts/networking/functions.network
similarity index 100%
rename from src/initscripts/init.d/networking/functions.network
rename to src/initscripts/networking/functions.network
diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/networking/red
similarity index 100%
rename from src/initscripts/init.d/networking/red
rename to src/initscripts/networking/red
diff --git a/src/initscripts/init.d/networking/red.down/05-update-dns-forwarders b/src/initscripts/networking/red.down/05-update-dns-forwarders
similarity index 100%
rename from src/initscripts/init.d/networking/red.down/05-update-dns-forwarders
rename to src/initscripts/networking/red.down/05-update-dns-forwarders
diff --git a/src/initscripts/init.d/networking/red.down/10-ipsec b/src/initscripts/networking/red.down/10-ipsec
similarity index 100%
rename from src/initscripts/init.d/networking/red.down/10-ipsec
rename to src/initscripts/networking/red.down/10-ipsec
diff --git a/src/initscripts/init.d/networking/red.down/10-miniupnpd b/src/initscripts/networking/red.down/10-miniupnpd
similarity index 100%
rename from src/initscripts/init.d/networking/red.down/10-miniupnpd
rename to src/initscripts/networking/red.down/10-miniupnpd
diff --git a/src/initscripts/init.d/networking/red.down/10-ovpn b/src/initscripts/networking/red.down/10-ovpn
similarity index 100%
rename from src/initscripts/init.d/networking/red.down/10-ovpn
rename to src/initscripts/networking/red.down/10-ovpn
diff --git a/src/initscripts/init.d/networking/red.down/10-static-routes b/src/initscripts/networking/red.down/10-static-routes
similarity index 100%
rename from src/initscripts/init.d/networking/red.down/10-static-routes
rename to src/initscripts/networking/red.down/10-static-routes
diff --git a/src/initscripts/init.d/networking/red.down/20-firewall b/src/initscripts/networking/red.down/20-firewall
similarity index 100%
rename from src/initscripts/init.d/networking/red.down/20-firewall
rename to src/initscripts/networking/red.down/20-firewall
diff --git a/src/initscripts/init.d/networking/red.up/01-conntrack-cleanup b/src/initscripts/networking/red.up/01-conntrack-cleanup
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/01-conntrack-cleanup
rename to src/initscripts/networking/red.up/01-conntrack-cleanup
diff --git a/src/initscripts/init.d/networking/red.up/05-update-dns-forwarders b/src/initscripts/networking/red.up/05-update-dns-forwarders
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/05-update-dns-forwarders
rename to src/initscripts/networking/red.up/05-update-dns-forwarders
diff --git a/src/initscripts/init.d/networking/red.up/10-miniupnpd b/src/initscripts/networking/red.up/10-miniupnpd
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/10-miniupnpd
rename to src/initscripts/networking/red.up/10-miniupnpd
diff --git a/src/initscripts/init.d/networking/red.up/10-multicast b/src/initscripts/networking/red.up/10-multicast
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/10-multicast
rename to src/initscripts/networking/red.up/10-multicast
diff --git a/src/initscripts/init.d/networking/red.up/10-static-routes b/src/initscripts/networking/red.up/10-static-routes
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/10-static-routes
rename to src/initscripts/networking/red.up/10-static-routes
diff --git a/src/initscripts/init.d/networking/red.up/20-firewall b/src/initscripts/networking/red.up/20-firewall
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/20-firewall
rename to src/initscripts/networking/red.up/20-firewall
diff --git a/src/initscripts/init.d/networking/red.up/30-ddns b/src/initscripts/networking/red.up/30-ddns
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/30-ddns
rename to src/initscripts/networking/red.up/30-ddns
diff --git a/src/initscripts/init.d/networking/red.up/35-guardian b/src/initscripts/networking/red.up/35-guardian
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/35-guardian
rename to src/initscripts/networking/red.up/35-guardian
diff --git a/src/initscripts/init.d/networking/red.up/50-ipsec b/src/initscripts/networking/red.up/50-ipsec
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/50-ipsec
rename to src/initscripts/networking/red.up/50-ipsec
diff --git a/src/initscripts/init.d/networking/red.up/50-ovpn b/src/initscripts/networking/red.up/50-ovpn
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/50-ovpn
rename to src/initscripts/networking/red.up/50-ovpn
diff --git a/src/initscripts/init.d/networking/red.up/98-leds b/src/initscripts/networking/red.up/98-leds
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/98-leds
rename to src/initscripts/networking/red.up/98-leds
diff --git a/src/initscripts/init.d/networking/red.up/99-fireinfo b/src/initscripts/networking/red.up/99-fireinfo
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/99-fireinfo
rename to src/initscripts/networking/red.up/99-fireinfo
diff --git a/src/initscripts/init.d/networking/red.up/99-geoip-database b/src/initscripts/networking/red.up/99-geoip-database
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/99-geoip-database
rename to src/initscripts/networking/red.up/99-geoip-database
diff --git a/src/initscripts/init.d/networking/red.up/99-pakfire-update b/src/initscripts/networking/red.up/99-pakfire-update
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/99-pakfire-update
rename to src/initscripts/networking/red.up/99-pakfire-update
diff --git a/src/initscripts/init.d/networking/wpa_supplicant.exe b/src/initscripts/networking/wpa_supplicant.exe
similarity index 100%
rename from src/initscripts/init.d/networking/wpa_supplicant.exe
rename to src/initscripts/networking/wpa_supplicant.exe
diff --git a/src/initscripts/init.d/alsa b/src/initscripts/packages/alsa
similarity index 100%
rename from src/initscripts/init.d/alsa
rename to src/initscripts/packages/alsa
diff --git a/src/initscripts/init.d/amavisd b/src/initscripts/packages/amavisd
similarity index 100%
rename from src/initscripts/init.d/amavisd
rename to src/initscripts/packages/amavisd
diff --git a/src/initscripts/init.d/apcupsd b/src/initscripts/packages/apcupsd
similarity index 100%
rename from src/initscripts/init.d/apcupsd
rename to src/initscripts/packages/apcupsd
diff --git a/src/initscripts/init.d/asterisk b/src/initscripts/packages/asterisk
similarity index 100%
rename from src/initscripts/init.d/asterisk
rename to src/initscripts/packages/asterisk
diff --git a/src/initscripts/init.d/bluetooth b/src/initscripts/packages/bluetooth
similarity index 100%
rename from src/initscripts/init.d/bluetooth
rename to src/initscripts/packages/bluetooth
diff --git a/src/initscripts/init.d/clamav b/src/initscripts/packages/clamav
similarity index 100%
rename from src/initscripts/init.d/clamav
rename to src/initscripts/packages/clamav
diff --git a/src/initscripts/init.d/client175 b/src/initscripts/packages/client175
similarity index 100%
rename from src/initscripts/init.d/client175
rename to src/initscripts/packages/client175
diff --git a/src/initscripts/init.d/cpufreq b/src/initscripts/packages/cpufreq
similarity index 100%
rename from src/initscripts/init.d/cpufreq
rename to src/initscripts/packages/cpufreq
diff --git a/src/initscripts/init.d/cups b/src/initscripts/packages/cups
similarity index 100%
rename from src/initscripts/init.d/cups
rename to src/initscripts/packages/cups
diff --git a/src/initscripts/init.d/cyrus-imapd b/src/initscripts/packages/cyrus-imapd
similarity index 100%
rename from src/initscripts/init.d/cyrus-imapd
rename to src/initscripts/packages/cyrus-imapd
diff --git a/src/initscripts/init.d/cyrus-sasl b/src/initscripts/packages/cyrus-sasl
similarity index 100%
rename from src/initscripts/init.d/cyrus-sasl
rename to src/initscripts/packages/cyrus-sasl
diff --git a/src/initscripts/init.d/dnsdist b/src/initscripts/packages/dnsdist
similarity index 100%
rename from src/initscripts/init.d/dnsdist
rename to src/initscripts/packages/dnsdist
diff --git a/src/initscripts/init.d/fetchmail b/src/initscripts/packages/fetchmail
similarity index 100%
rename from src/initscripts/init.d/fetchmail
rename to src/initscripts/packages/fetchmail
diff --git a/src/initscripts/init.d/freeradius b/src/initscripts/packages/freeradius
similarity index 100%
rename from src/initscripts/init.d/freeradius
rename to src/initscripts/packages/freeradius
diff --git a/src/initscripts/init.d/gnump3d b/src/initscripts/packages/gnump3d
similarity index 100%
rename from src/initscripts/init.d/gnump3d
rename to src/initscripts/packages/gnump3d
diff --git a/src/initscripts/init.d/guardian b/src/initscripts/packages/guardian
similarity index 100%
rename from src/initscripts/init.d/guardian
rename to src/initscripts/packages/guardian
diff --git a/src/initscripts/init.d/haproxy b/src/initscripts/packages/haproxy
similarity index 100%
rename from src/initscripts/init.d/haproxy
rename to src/initscripts/packages/haproxy
diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/packages/hostapd
similarity index 100%
rename from src/initscripts/init.d/hostapd
rename to src/initscripts/packages/hostapd
diff --git a/src/initscripts/init.d/imspector b/src/initscripts/packages/imspector
similarity index 100%
rename from src/initscripts/init.d/imspector
rename to src/initscripts/packages/imspector
diff --git a/src/initscripts/init.d/keepalived b/src/initscripts/packages/keepalived
similarity index 100%
rename from src/initscripts/init.d/keepalived
rename to src/initscripts/packages/keepalived
diff --git a/src/initscripts/init.d/lcd4linux b/src/initscripts/packages/lcd4linux
similarity index 100%
rename from src/initscripts/init.d/lcd4linux
rename to src/initscripts/packages/lcd4linux
diff --git a/src/initscripts/init.d/lcdproc b/src/initscripts/packages/lcdproc
similarity index 100%
rename from src/initscripts/init.d/lcdproc
rename to src/initscripts/packages/lcdproc
diff --git a/src/initscripts/init.d/lcr b/src/initscripts/packages/lcr
similarity index 100%
rename from src/initscripts/init.d/lcr
rename to src/initscripts/packages/lcr
diff --git a/src/initscripts/init.d/libvirtd b/src/initscripts/packages/libvirtd
similarity index 100%
rename from src/initscripts/init.d/libvirtd
rename to src/initscripts/packages/libvirtd
diff --git a/src/initscripts/init.d/mediatomb b/src/initscripts/packages/mediatomb
similarity index 100%
rename from src/initscripts/init.d/mediatomb
rename to src/initscripts/packages/mediatomb
diff --git a/src/initscripts/init.d/messagebus b/src/initscripts/packages/messagebus
similarity index 100%
rename from src/initscripts/init.d/messagebus
rename to src/initscripts/packages/messagebus
diff --git a/src/initscripts/init.d/miau b/src/initscripts/packages/miau
similarity index 100%
rename from src/initscripts/init.d/miau
rename to src/initscripts/packages/miau
diff --git a/src/initscripts/init.d/minidlna b/src/initscripts/packages/minidlna
similarity index 100%
rename from src/initscripts/init.d/minidlna
rename to src/initscripts/packages/minidlna
diff --git a/src/initscripts/init.d/miniupnpd b/src/initscripts/packages/miniupnpd
similarity index 100%
rename from src/initscripts/init.d/miniupnpd
rename to src/initscripts/packages/miniupnpd
diff --git a/src/initscripts/init.d/monit b/src/initscripts/packages/monit
similarity index 100%
rename from src/initscripts/init.d/monit
rename to src/initscripts/packages/monit
diff --git a/src/initscripts/init.d/motion b/src/initscripts/packages/motion
similarity index 100%
rename from src/initscripts/init.d/motion
rename to src/initscripts/packages/motion
diff --git a/src/initscripts/init.d/mpd b/src/initscripts/packages/mpd
similarity index 100%
rename from src/initscripts/init.d/mpd
rename to src/initscripts/packages/mpd
diff --git a/src/initscripts/init.d/mysql b/src/initscripts/packages/mysql
similarity index 100%
rename from src/initscripts/init.d/mysql
rename to src/initscripts/packages/mysql
diff --git a/src/initscripts/init.d/netsnmpd b/src/initscripts/packages/netsnmpd
similarity index 100%
rename from src/initscripts/init.d/netsnmpd
rename to src/initscripts/packages/netsnmpd
diff --git a/src/initscripts/init.d/nfs-server b/src/initscripts/packages/nfs-server
similarity index 100%
rename from src/initscripts/init.d/nfs-server
rename to src/initscripts/packages/nfs-server
diff --git a/src/initscripts/init.d/nut b/src/initscripts/packages/nut
similarity index 100%
rename from src/initscripts/init.d/nut
rename to src/initscripts/packages/nut
diff --git a/src/initscripts/init.d/openvmtools b/src/initscripts/packages/openvmtools
similarity index 100%
rename from src/initscripts/init.d/openvmtools
rename to src/initscripts/packages/openvmtools
diff --git a/src/initscripts/init.d/postfix b/src/initscripts/packages/postfix
similarity index 100%
rename from src/initscripts/init.d/postfix
rename to src/initscripts/packages/postfix
diff --git a/src/initscripts/init.d/pound b/src/initscripts/packages/pound
similarity index 100%
rename from src/initscripts/init.d/pound
rename to src/initscripts/packages/pound
diff --git a/src/initscripts/init.d/rpcbind b/src/initscripts/packages/rpcbind
similarity index 100%
rename from src/initscripts/init.d/rpcbind
rename to src/initscripts/packages/rpcbind
diff --git a/src/initscripts/init.d/rtpproxy b/src/initscripts/packages/rtpproxy
similarity index 100%
rename from src/initscripts/init.d/rtpproxy
rename to src/initscripts/packages/rtpproxy
diff --git a/src/initscripts/init.d/samba b/src/initscripts/packages/samba
similarity index 100%
rename from src/initscripts/init.d/samba
rename to src/initscripts/packages/samba
diff --git a/src/initscripts/init.d/sane b/src/initscripts/packages/sane
similarity index 100%
rename from src/initscripts/init.d/sane
rename to src/initscripts/packages/sane
diff --git a/src/initscripts/init.d/spamassassin b/src/initscripts/packages/spamassassin
similarity index 100%
rename from src/initscripts/init.d/spamassassin
rename to src/initscripts/packages/spamassassin
diff --git a/src/initscripts/init.d/sslh b/src/initscripts/packages/sslh
similarity index 100%
rename from src/initscripts/init.d/sslh
rename to src/initscripts/packages/sslh
diff --git a/src/initscripts/init.d/stunnel b/src/initscripts/packages/stunnel
similarity index 100%
rename from src/initscripts/init.d/stunnel
rename to src/initscripts/packages/stunnel
diff --git a/src/initscripts/init.d/tftpd b/src/initscripts/packages/tftpd
similarity index 100%
rename from src/initscripts/init.d/tftpd
rename to src/initscripts/packages/tftpd
diff --git a/src/initscripts/init.d/tor b/src/initscripts/packages/tor
similarity index 100%
rename from src/initscripts/init.d/tor
rename to src/initscripts/packages/tor
diff --git a/src/initscripts/init.d/transmission b/src/initscripts/packages/transmission
similarity index 100%
rename from src/initscripts/init.d/transmission
rename to src/initscripts/packages/transmission
diff --git a/src/initscripts/init.d/vdr b/src/initscripts/packages/vdr
similarity index 100%
rename from src/initscripts/init.d/vdr
rename to src/initscripts/packages/vdr
diff --git a/src/initscripts/init.d/vdradmin b/src/initscripts/packages/vdradmin
similarity index 100%
rename from src/initscripts/init.d/vdradmin
rename to src/initscripts/packages/vdradmin
diff --git a/src/initscripts/init.d/virtlogd b/src/initscripts/packages/virtlogd
similarity index 100%
rename from src/initscripts/init.d/virtlogd
rename to src/initscripts/packages/virtlogd
diff --git a/src/initscripts/init.d/vsftpd b/src/initscripts/packages/vsftpd
similarity index 100%
rename from src/initscripts/init.d/vsftpd
rename to src/initscripts/packages/vsftpd
diff --git a/src/initscripts/init.d/watchdog b/src/initscripts/packages/watchdog
similarity index 100%
rename from src/initscripts/init.d/watchdog
rename to src/initscripts/packages/watchdog
diff --git a/src/initscripts/init.d/xinetd b/src/initscripts/packages/xinetd
similarity index 100%
rename from src/initscripts/init.d/xinetd
rename to src/initscripts/packages/xinetd
diff --git a/src/initscripts/init.d/acpid b/src/initscripts/system/acpid
similarity index 100%
rename from src/initscripts/init.d/acpid
rename to src/initscripts/system/acpid
diff --git a/src/initscripts/init.d/apache b/src/initscripts/system/apache
similarity index 100%
rename from src/initscripts/init.d/apache
rename to src/initscripts/system/apache
diff --git a/src/initscripts/init.d/beep b/src/initscripts/system/beep
similarity index 100%
rename from src/initscripts/init.d/beep
rename to src/initscripts/system/beep
diff --git a/src/initscripts/init.d/checkfs b/src/initscripts/system/checkfs
similarity index 100%
rename from src/initscripts/init.d/checkfs
rename to src/initscripts/system/checkfs
diff --git a/src/initscripts/init.d/cleanfs b/src/initscripts/system/cleanfs
similarity index 100%
rename from src/initscripts/init.d/cleanfs
rename to src/initscripts/system/cleanfs
diff --git a/src/initscripts/init.d/collectd b/src/initscripts/system/collectd
similarity index 100%
rename from src/initscripts/init.d/collectd
rename to src/initscripts/system/collectd
diff --git a/src/initscripts/init.d/connectd b/src/initscripts/system/connectd
similarity index 100%
rename from src/initscripts/init.d/connectd
rename to src/initscripts/system/connectd
diff --git a/src/initscripts/init.d/console b/src/initscripts/system/console
similarity index 100%
rename from src/initscripts/init.d/console
rename to src/initscripts/system/console
diff --git a/src/initscripts/init.d/dhcp b/src/initscripts/system/dhcp
similarity index 100%
rename from src/initscripts/init.d/dhcp
rename to src/initscripts/system/dhcp
diff --git a/src/initscripts/init.d/dhcrelay b/src/initscripts/system/dhcrelay
similarity index 100%
rename from src/initscripts/init.d/dhcrelay
rename to src/initscripts/system/dhcrelay
diff --git a/src/initscripts/init.d/fcron b/src/initscripts/system/fcron
similarity index 100%
rename from src/initscripts/init.d/fcron
rename to src/initscripts/system/fcron
diff --git a/src/initscripts/init.d/fireinfo b/src/initscripts/system/fireinfo
similarity index 100%
rename from src/initscripts/init.d/fireinfo
rename to src/initscripts/system/fireinfo
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/system/firewall
similarity index 100%
rename from src/initscripts/init.d/firewall
rename to src/initscripts/system/firewall
diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/system/firstsetup
similarity index 100%
rename from src/initscripts/init.d/firstsetup
rename to src/initscripts/system/firstsetup
diff --git a/src/initscripts/init.d/fsresize b/src/initscripts/system/fsresize
similarity index 100%
rename from src/initscripts/init.d/fsresize
rename to src/initscripts/system/fsresize
diff --git a/src/initscripts/init.d/functions b/src/initscripts/system/functions
similarity index 100%
rename from src/initscripts/init.d/functions
rename to src/initscripts/system/functions
diff --git a/src/initscripts/init.d/halt b/src/initscripts/system/halt
similarity index 100%
rename from src/initscripts/init.d/halt
rename to src/initscripts/system/halt
diff --git a/src/initscripts/init.d/ipsec b/src/initscripts/system/ipsec
similarity index 100%
rename from src/initscripts/init.d/ipsec
rename to src/initscripts/system/ipsec
diff --git a/src/initscripts/init.d/leds b/src/initscripts/system/leds
similarity index 100%
rename from src/initscripts/init.d/leds
rename to src/initscripts/system/leds
diff --git a/src/initscripts/init.d/localnet b/src/initscripts/system/localnet
similarity index 100%
rename from src/initscripts/init.d/localnet
rename to src/initscripts/system/localnet
diff --git a/src/initscripts/init.d/mISDN b/src/initscripts/system/mISDN
similarity index 100%
rename from src/initscripts/init.d/mISDN
rename to src/initscripts/system/mISDN
diff --git a/src/initscripts/init.d/modules b/src/initscripts/system/modules
similarity index 100%
rename from src/initscripts/init.d/modules
rename to src/initscripts/system/modules
diff --git a/src/initscripts/init.d/mountfs b/src/initscripts/system/mountfs
similarity index 100%
rename from src/initscripts/init.d/mountfs
rename to src/initscripts/system/mountfs
diff --git a/src/initscripts/init.d/mountkernfs b/src/initscripts/system/mountkernfs
similarity index 100%
rename from src/initscripts/init.d/mountkernfs
rename to src/initscripts/system/mountkernfs
diff --git a/src/initscripts/init.d/mounttmpfs b/src/initscripts/system/mounttmpfs
similarity index 100%
rename from src/initscripts/init.d/mounttmpfs
rename to src/initscripts/system/mounttmpfs
diff --git a/src/initscripts/init.d/network b/src/initscripts/system/network
similarity index 100%
rename from src/initscripts/init.d/network
rename to src/initscripts/system/network
diff --git a/src/initscripts/init.d/network-trigger b/src/initscripts/system/network-trigger
similarity index 100%
rename from src/initscripts/init.d/network-trigger
rename to src/initscripts/system/network-trigger
diff --git a/src/initscripts/init.d/ntp b/src/initscripts/system/ntp
similarity index 100%
rename from src/initscripts/init.d/ntp
rename to src/initscripts/system/ntp
diff --git a/src/initscripts/init.d/partresize b/src/initscripts/system/partresize
similarity index 100%
rename from src/initscripts/init.d/partresize
rename to src/initscripts/system/partresize
diff --git a/src/initscripts/init.d/random b/src/initscripts/system/random
similarity index 100%
rename from src/initscripts/init.d/random
rename to src/initscripts/system/random
diff --git a/src/initscripts/init.d/rc b/src/initscripts/system/rc
similarity index 100%
rename from src/initscripts/init.d/rc
rename to src/initscripts/system/rc
diff --git a/src/initscripts/init.d/reboot b/src/initscripts/system/reboot
similarity index 100%
rename from src/initscripts/init.d/reboot
rename to src/initscripts/system/reboot
diff --git a/src/initscripts/init.d/rngd b/src/initscripts/system/rngd
similarity index 100%
rename from src/initscripts/init.d/rngd
rename to src/initscripts/system/rngd
diff --git a/src/initscripts/init.d/sendsignals b/src/initscripts/system/sendsignals
similarity index 100%
rename from src/initscripts/init.d/sendsignals
rename to src/initscripts/system/sendsignals
diff --git a/src/initscripts/init.d/setclock b/src/initscripts/system/setclock
similarity index 100%
rename from src/initscripts/init.d/setclock
rename to src/initscripts/system/setclock
diff --git a/src/initscripts/init.d/smartenabler b/src/initscripts/system/smartenabler
similarity index 100%
rename from src/initscripts/init.d/smartenabler
rename to src/initscripts/system/smartenabler
diff --git a/src/initscripts/init.d/snort b/src/initscripts/system/snort
similarity index 100%
rename from src/initscripts/init.d/snort
rename to src/initscripts/system/snort
diff --git a/src/initscripts/init.d/squid b/src/initscripts/system/squid
similarity index 100%
rename from src/initscripts/init.d/squid
rename to src/initscripts/system/squid
diff --git a/src/initscripts/init.d/sshd b/src/initscripts/system/sshd
similarity index 100%
rename from src/initscripts/init.d/sshd
rename to src/initscripts/system/sshd
diff --git a/src/initscripts/init.d/static-routes b/src/initscripts/system/static-routes
similarity index 100%
rename from src/initscripts/init.d/static-routes
rename to src/initscripts/system/static-routes
diff --git a/src/initscripts/init.d/swap b/src/initscripts/system/swap
similarity index 100%
rename from src/initscripts/init.d/swap
rename to src/initscripts/system/swap
diff --git a/src/initscripts/init.d/swconfig b/src/initscripts/system/swconfig
similarity index 100%
rename from src/initscripts/init.d/swconfig
rename to src/initscripts/system/swconfig
diff --git a/src/initscripts/init.d/sysctl b/src/initscripts/system/sysctl
similarity index 100%
rename from src/initscripts/init.d/sysctl
rename to src/initscripts/system/sysctl
diff --git a/src/initscripts/init.d/sysklogd b/src/initscripts/system/sysklogd
similarity index 100%
rename from src/initscripts/init.d/sysklogd
rename to src/initscripts/system/sysklogd
diff --git a/src/initscripts/init.d/template b/src/initscripts/system/template
similarity index 100%
rename from src/initscripts/init.d/template
rename to src/initscripts/system/template
diff --git a/src/initscripts/init.d/udev b/src/initscripts/system/udev
similarity index 100%
rename from src/initscripts/init.d/udev
rename to src/initscripts/system/udev
diff --git a/src/initscripts/init.d/udev_retry b/src/initscripts/system/udev_retry
similarity index 100%
rename from src/initscripts/init.d/udev_retry
rename to src/initscripts/system/udev_retry
diff --git a/src/initscripts/init.d/unbound b/src/initscripts/system/unbound
similarity index 100%
rename from src/initscripts/init.d/unbound
rename to src/initscripts/system/unbound
diff --git a/src/initscripts/init.d/upnpd b/src/initscripts/system/upnpd
similarity index 100%
rename from src/initscripts/init.d/upnpd
rename to src/initscripts/system/upnpd
diff --git a/src/initscripts/init.d/vnstat b/src/initscripts/system/vnstat
similarity index 100%
rename from src/initscripts/init.d/vnstat
rename to src/initscripts/system/vnstat
diff --git a/src/initscripts/init.d/waitdrives b/src/initscripts/system/waitdrives
similarity index 100%
rename from src/initscripts/init.d/waitdrives
rename to src/initscripts/system/waitdrives
diff --git a/src/initscripts/init.d/wlanclient b/src/initscripts/system/wlanclient
similarity index 100%
rename from src/initscripts/init.d/wlanclient
rename to src/initscripts/system/wlanclient
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2017-03-09 11:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170309110517.0BE0C10853C3@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox