]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Move all Initscripts of the system, into an extra directory
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Wed, 22 Feb 2017 09:23:10 +0000 (10:23 +0100)
committerJonatan Schlag <jonatan.schlag@ipfire.org>
Wed, 22 Feb 2017 09:23:10 +0000 (10:23 +0100)
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@ipfire.org>
56 files changed:
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/i586/initscripts
config/rootfiles/common/x86_64/initscripts
lfs/initscripts
src/initscripts/init.d/common/acpid [moved from src/initscripts/init.d/acpid with 100% similarity]
src/initscripts/init.d/common/apache [moved from src/initscripts/init.d/apache with 100% similarity]
src/initscripts/init.d/common/beep [moved from src/initscripts/init.d/beep with 100% similarity]
src/initscripts/init.d/common/checkfs [moved from src/initscripts/init.d/checkfs with 100% similarity]
src/initscripts/init.d/common/cleanfs [moved from src/initscripts/init.d/cleanfs with 100% similarity]
src/initscripts/init.d/common/collectd [moved from src/initscripts/init.d/collectd with 100% similarity]
src/initscripts/init.d/common/connectd [moved from src/initscripts/init.d/connectd with 100% similarity]
src/initscripts/init.d/common/console [moved from src/initscripts/init.d/console with 100% similarity]
src/initscripts/init.d/common/dhcp [moved from src/initscripts/init.d/dhcp with 100% similarity]
src/initscripts/init.d/common/dhcrelay [moved from src/initscripts/init.d/dhcrelay with 100% similarity]
src/initscripts/init.d/common/fcron [moved from src/initscripts/init.d/fcron with 100% similarity]
src/initscripts/init.d/common/fireinfo [moved from src/initscripts/init.d/fireinfo with 100% similarity]
src/initscripts/init.d/common/firewall [moved from src/initscripts/init.d/firewall with 100% similarity]
src/initscripts/init.d/common/firstsetup [moved from src/initscripts/init.d/firstsetup with 100% similarity]
src/initscripts/init.d/common/fsresize [moved from src/initscripts/init.d/fsresize with 100% similarity]
src/initscripts/init.d/common/functions [moved from src/initscripts/init.d/functions with 100% similarity]
src/initscripts/init.d/common/halt [moved from src/initscripts/init.d/halt with 100% similarity]
src/initscripts/init.d/common/ipsec [moved from src/initscripts/init.d/ipsec with 100% similarity]
src/initscripts/init.d/common/leds [moved from src/initscripts/init.d/leds with 100% similarity]
src/initscripts/init.d/common/localnet [moved from src/initscripts/init.d/localnet with 100% similarity]
src/initscripts/init.d/common/mISDN [moved from src/initscripts/init.d/mISDN with 100% similarity]
src/initscripts/init.d/common/modules [moved from src/initscripts/init.d/modules with 100% similarity]
src/initscripts/init.d/common/mountfs [moved from src/initscripts/init.d/mountfs with 100% similarity]
src/initscripts/init.d/common/mountkernfs [moved from src/initscripts/init.d/mountkernfs with 100% similarity]
src/initscripts/init.d/common/mounttmpfs [moved from src/initscripts/init.d/mounttmpfs with 100% similarity]
src/initscripts/init.d/common/network [moved from src/initscripts/init.d/network with 100% similarity]
src/initscripts/init.d/common/network-trigger [moved from src/initscripts/init.d/network-trigger with 100% similarity]
src/initscripts/init.d/common/ntp [moved from src/initscripts/init.d/ntp with 100% similarity]
src/initscripts/init.d/common/partresize [moved from src/initscripts/init.d/partresize with 100% similarity]
src/initscripts/init.d/common/random [moved from src/initscripts/init.d/random with 100% similarity]
src/initscripts/init.d/common/rc [moved from src/initscripts/init.d/rc with 100% similarity]
src/initscripts/init.d/common/reboot [moved from src/initscripts/init.d/reboot with 100% similarity]
src/initscripts/init.d/common/rngd [moved from src/initscripts/init.d/rngd with 100% similarity]
src/initscripts/init.d/common/sendsignals [moved from src/initscripts/init.d/sendsignals with 100% similarity]
src/initscripts/init.d/common/setclock [moved from src/initscripts/init.d/setclock with 100% similarity]
src/initscripts/init.d/common/smartenabler [moved from src/initscripts/init.d/smartenabler with 100% similarity]
src/initscripts/init.d/common/snort [moved from src/initscripts/init.d/snort with 100% similarity]
src/initscripts/init.d/common/squid [moved from src/initscripts/init.d/squid with 100% similarity]
src/initscripts/init.d/common/sshd [moved from src/initscripts/init.d/sshd with 100% similarity]
src/initscripts/init.d/common/static-routes [moved from src/initscripts/init.d/static-routes with 100% similarity]
src/initscripts/init.d/common/swap [moved from src/initscripts/init.d/swap with 100% similarity]
src/initscripts/init.d/common/swconfig [moved from src/initscripts/init.d/swconfig with 100% similarity]
src/initscripts/init.d/common/sysctl [moved from src/initscripts/init.d/sysctl with 100% similarity]
src/initscripts/init.d/common/sysklogd [moved from src/initscripts/init.d/sysklogd with 100% similarity]
src/initscripts/init.d/common/template [moved from src/initscripts/init.d/template with 100% similarity]
src/initscripts/init.d/common/udev [moved from src/initscripts/init.d/udev with 100% similarity]
src/initscripts/init.d/common/udev_retry [moved from src/initscripts/init.d/udev_retry with 100% similarity]
src/initscripts/init.d/common/unbound [moved from src/initscripts/init.d/unbound with 100% similarity]
src/initscripts/init.d/common/upnpd [moved from src/initscripts/init.d/upnpd with 100% similarity]
src/initscripts/init.d/common/vnstat [moved from src/initscripts/init.d/vnstat with 100% similarity]
src/initscripts/init.d/common/waitdrives [moved from src/initscripts/init.d/waitdrives with 100% similarity]
src/initscripts/init.d/common/wlanclient [moved from src/initscripts/init.d/wlanclient with 100% similarity]

index e1e78dce1513cae296d5c93512d9124f1484d32f..1e67c36e68b60fe33ffa1723158d53f7021e00d6 100644 (file)
@@ -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
index 75aad1783ffc21510d507dfb9795d2d704388a4f..760a12869cf829c375f1833d31e084b95964feba 100644 (file)
@@ -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
index 75aad1783ffc21510d507dfb9795d2d704388a4f..760a12869cf829c375f1833d31e084b95964feba 100644 (file)
@@ -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
index c5baf680a7c1b69af867fb053d737f3f982c18f0..61d08df4c56923e2ea9954f550d134ab438c3db3 100644 (file)
@@ -64,7 +64,7 @@ $(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/init.d/common/*; do \
                install -v -m 754 $$i /etc/rc.d/init.d/; \
        done
        chmod 644 /etc/rc.d/init.d/functions