Merge branch 'next' into initscripts-cleanup

diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index e1e78dce1513cae296d5c93512d9124f1484d32f..1e67c36e68b60fe33ffa1723158d53f7021e00d6 100644 (file)
--- 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 75aad1783ffc21510d507dfb9795d2d704388a4f..760a12869cf829c375f1833d31e084b95964feba 100644 (file)
--- 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 75aad1783ffc21510d507dfb9795d2d704388a4f..760a12869cf829c375f1833d31e084b95964feba 100644 (file)
--- 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 4de8bd34c12c53f1a8ca2dc1642ee379844b1335..3101d8b5a67dc79d73f19e2b207c6f5426d508f4 100644 (file)
--- 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 b9c3bb452ca437f99671a82aea3f8f4bbeb03326..72ea70d205a649babbb7cb9a00c18d5a64cd5c34 100644 (file)
--- 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/apcupsd b/lfs/apcupsd
index 4e9137b111ed9a2fb74a4e551ac2059095810dcd..1d8e0ff4026745bced21412a41cde1fa371e9e33 100644 (file)
--- 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 a0276bc5605770682fe90b2dcfa4eed4c55a92b4..31f6ec0fe83e32abd373939ec12720f705421fb3 100755 (executable)
--- 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 dc5eec7ea567ca15c60000e6187cebcd39c42cfa..2c57809546fccd09f555156fd4599d92b3fac0d1 100644 (file)
--- 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 2cd5e493b9e86eda29b01f4be3d3dc459023fa1e..650faecbebcf7c21983f17523feeb656e93f32f7 100644 (file)
--- 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/cups b/lfs/cups
index 5f900048b703cc0755d9ef03289284cd59bceef5..b6860672e278c0bd93b442c79e6634688c011db0 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -91,7 +91,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/dnsdist b/lfs/dnsdist
index a5d9fea9ff94f88cbb4a7ccf9896ea8c7d4a1ee4..aeb11c87afc053a320fa0655b9938f15a284b903 100644 (file)
--- 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/freeradius b/lfs/freeradius
index d9a80c638c91b419421bb40050ade13662e89ca3..a07a535ab066c4af88cfaeb2858bc6cc14d550db 100644 (file)
--- 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/guardian b/lfs/guardian
index d3634195e0fd1bf0b0727958c64bab60d4ce5b2a..2120a08a4490ac6b65f90e789de82bea2143ad6c 100644 (file)
--- 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 4af22730772d6f7205890048af8b8ed26ed98420..0e5a067f88e1a21a14d203af461cfb36b8b102d1 100644 (file)
--- 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 a4fe99a92e01bb57b59f3a68daec5e0f3a9e629c..1a2436caa4d10178b68211b787d12faf0bf93147 100644 (file)
--- 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/initscripts b/lfs/initscripts
index c5baf680a7c1b69af867fb053d737f3f982c18f0..ef7114c90eca0479d851db451df6d8314c058c38 100644 (file)
--- 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 2054a542195be6ee4663e21e3d1313f54203934c..257ceb2d9692d6ca6aee4416a6bb599611111aab 100644 (file)
--- 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/libvirt b/lfs/libvirt
index 996d32ecd303c2471cbe905c40dbcb53f171959e..5a9548d49dc53ad39dcb209cbf3f4c2d46eb9010 100644 (file)
--- 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/mysql b/lfs/mysql
index edcd651f8904946739f3a339dd49b115d98c35cd..089516efa3353fb07cfb82ffe3b6af344b95099e 100644 (file)
--- 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/nfs b/lfs/nfs
index 23a17739eea0769d1f75d2af8bf6eccfda9d9855..2a8e331b534d98068f87564308033ae4fae77cd2 100644 (file)
--- 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 c64c5a26b53087f5a06038447c68e519d4b40ff1..2045dce6cb4fcfd1470053a66bf7f420d9bb5774 100644 (file)
--- 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 72101d5260f221e5318b5943728451ccc3c49d63..1cf9427fe2bddf42f439c27cd574db6d232e120f 100644 (file)
--- 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/pound b/lfs/pound
index 3860122a9f9d9a434941cd8adf0a132b83add0ce..b4206d0e57c6e6513c144b9006ee3fe73243e393 100644 (file)
--- 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 e7f9eff08bcb32634b2a5c1007dc8dd7e46992b3..046121f362733fc7f722f80f365dbe567fddc972 100644 (file)
--- 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/samba b/lfs/samba
index 74a1b769edd88ec9f087decb563c9c2facb1ac76..076152f48e74d6c9dd607abd2cd34a2397d46d5e 100644 (file)
--- 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 64f337592b5bbdc6e2b87a205a8f27c75dbe9296..9e456f017f9419c98793ffba9c8407ce1be77f33 100644 (file)
--- 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/tor b/lfs/tor
index be812e021ffd3b2b045650ebadc420dad8ea10a6..4da2c7c733f0ee62b9f4147ab1d01358dbd583f4 100644 (file)
--- 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 36eb3c424ecaee897a71489dfe135d13f28b1454..79ebaa1f90f501050ea8976adaff1f9200f592cc 100644 (file)
--- 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/watchdog b/lfs/watchdog
index 70bf6921ea5ae6ea5487a95db9828a9714ddfb08..9bef907287f11fb858b8d5f5cb65f5597f13bf9c 100644 (file)
--- 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 62f34eabba3bd50ad9456337de59971ebe8a09dd..d3b577b5c83702d13d7e907c9f2bdc38df0fddd3 100644 (file)
--- 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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