From 8bc8c282c9b7ef2280e7102e2824047975a9bb4c Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 10:23:10 +0100 Subject: [PATCH 01/63] 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 --- config/rootfiles/common/armv5tel/initscripts | 56 ------------------ config/rootfiles/common/i586/initscripts | 57 ------------------- config/rootfiles/common/x86_64/initscripts | 57 ------------------- lfs/initscripts | 2 +- src/initscripts/init.d/{ => common}/acpid | 0 src/initscripts/init.d/{ => common}/apache | 0 src/initscripts/init.d/{ => common}/beep | 0 src/initscripts/init.d/{ => common}/checkfs | 0 src/initscripts/init.d/{ => common}/cleanfs | 0 src/initscripts/init.d/{ => common}/collectd | 0 src/initscripts/init.d/{ => common}/connectd | 0 src/initscripts/init.d/{ => common}/console | 0 src/initscripts/init.d/{ => common}/dhcp | 0 src/initscripts/init.d/{ => common}/dhcrelay | 0 src/initscripts/init.d/{ => common}/fcron | 0 src/initscripts/init.d/{ => common}/fireinfo | 0 src/initscripts/init.d/{ => common}/firewall | 0 .../init.d/{ => common}/firstsetup | 0 src/initscripts/init.d/{ => common}/fsresize | 0 src/initscripts/init.d/{ => common}/functions | 0 src/initscripts/init.d/{ => common}/halt | 0 src/initscripts/init.d/{ => common}/ipsec | 0 src/initscripts/init.d/{ => common}/leds | 0 src/initscripts/init.d/{ => common}/localnet | 0 src/initscripts/init.d/{ => common}/mISDN | 0 src/initscripts/init.d/{ => common}/modules | 0 src/initscripts/init.d/{ => common}/mountfs | 0 .../init.d/{ => common}/mountkernfs | 0 .../init.d/{ => common}/mounttmpfs | 0 src/initscripts/init.d/{ => common}/network | 0 .../init.d/{ => common}/network-trigger | 0 src/initscripts/init.d/{ => common}/ntp | 0 .../init.d/{ => common}/partresize | 0 src/initscripts/init.d/{ => common}/random | 0 src/initscripts/init.d/{ => common}/rc | 0 src/initscripts/init.d/{ => common}/reboot | 0 src/initscripts/init.d/{ => common}/rngd | 0 .../init.d/{ => common}/sendsignals | 0 src/initscripts/init.d/{ => common}/setclock | 0 .../init.d/{ => common}/smartenabler | 0 src/initscripts/init.d/{ => common}/snort | 0 src/initscripts/init.d/{ => common}/squid | 0 src/initscripts/init.d/{ => common}/sshd | 0 .../init.d/{ => common}/static-routes | 0 src/initscripts/init.d/{ => common}/swap | 0 src/initscripts/init.d/{ => common}/swconfig | 0 src/initscripts/init.d/{ => common}/sysctl | 0 src/initscripts/init.d/{ => common}/sysklogd | 0 src/initscripts/init.d/{ => common}/template | 0 src/initscripts/init.d/{ => common}/udev | 0 .../init.d/{ => common}/udev_retry | 0 src/initscripts/init.d/{ => common}/unbound | 0 src/initscripts/init.d/{ => common}/upnpd | 0 src/initscripts/init.d/{ => common}/vnstat | 0 .../init.d/{ => common}/waitdrives | 0 .../init.d/{ => common}/wlanclient | 0 56 files changed, 1 insertion(+), 171 deletions(-) rename src/initscripts/init.d/{ => common}/acpid (100%) rename src/initscripts/init.d/{ => common}/apache (100%) rename src/initscripts/init.d/{ => common}/beep (100%) rename src/initscripts/init.d/{ => common}/checkfs (100%) rename src/initscripts/init.d/{ => common}/cleanfs (100%) rename src/initscripts/init.d/{ => common}/collectd (100%) rename src/initscripts/init.d/{ => common}/connectd (100%) rename src/initscripts/init.d/{ => common}/console (100%) rename src/initscripts/init.d/{ => common}/dhcp (100%) rename src/initscripts/init.d/{ => common}/dhcrelay (100%) rename src/initscripts/init.d/{ => common}/fcron (100%) rename src/initscripts/init.d/{ => common}/fireinfo (100%) rename src/initscripts/init.d/{ => common}/firewall (100%) rename src/initscripts/init.d/{ => common}/firstsetup (100%) rename src/initscripts/init.d/{ => common}/fsresize (100%) rename src/initscripts/init.d/{ => common}/functions (100%) rename src/initscripts/init.d/{ => common}/halt (100%) rename src/initscripts/init.d/{ => common}/ipsec (100%) rename src/initscripts/init.d/{ => common}/leds (100%) rename src/initscripts/init.d/{ => common}/localnet (100%) rename src/initscripts/init.d/{ => common}/mISDN (100%) rename src/initscripts/init.d/{ => common}/modules (100%) rename src/initscripts/init.d/{ => common}/mountfs (100%) rename src/initscripts/init.d/{ => common}/mountkernfs (100%) rename src/initscripts/init.d/{ => common}/mounttmpfs (100%) rename src/initscripts/init.d/{ => common}/network (100%) rename src/initscripts/init.d/{ => common}/network-trigger (100%) rename src/initscripts/init.d/{ => common}/ntp (100%) rename src/initscripts/init.d/{ => common}/partresize (100%) rename src/initscripts/init.d/{ => common}/random (100%) rename src/initscripts/init.d/{ => common}/rc (100%) rename src/initscripts/init.d/{ => common}/reboot (100%) rename src/initscripts/init.d/{ => common}/rngd (100%) rename src/initscripts/init.d/{ => common}/sendsignals (100%) rename src/initscripts/init.d/{ => common}/setclock (100%) rename src/initscripts/init.d/{ => common}/smartenabler (100%) rename src/initscripts/init.d/{ => common}/snort (100%) rename src/initscripts/init.d/{ => common}/squid (100%) rename src/initscripts/init.d/{ => common}/sshd (100%) rename src/initscripts/init.d/{ => common}/static-routes (100%) rename src/initscripts/init.d/{ => common}/swap (100%) rename src/initscripts/init.d/{ => common}/swconfig (100%) rename src/initscripts/init.d/{ => common}/sysctl (100%) rename src/initscripts/init.d/{ => common}/sysklogd (100%) rename src/initscripts/init.d/{ => common}/template (100%) rename src/initscripts/init.d/{ => common}/udev (100%) rename src/initscripts/init.d/{ => common}/udev_retry (100%) rename src/initscripts/init.d/{ => common}/unbound (100%) rename src/initscripts/init.d/{ => common}/upnpd (100%) rename src/initscripts/init.d/{ => common}/vnstat (100%) rename src/initscripts/init.d/{ => common}/waitdrives (100%) rename src/initscripts/init.d/{ => common}/wlanclient (100%) diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index e1e78dce1..1e67c36e6 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 75aad1783..760a12869 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 75aad1783..760a12869 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/initscripts b/lfs/initscripts index c5baf680a..61d08df4c 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -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 diff --git a/src/initscripts/init.d/acpid b/src/initscripts/init.d/common/acpid similarity index 100% rename from src/initscripts/init.d/acpid rename to src/initscripts/init.d/common/acpid diff --git a/src/initscripts/init.d/apache b/src/initscripts/init.d/common/apache similarity index 100% rename from src/initscripts/init.d/apache rename to src/initscripts/init.d/common/apache diff --git a/src/initscripts/init.d/beep b/src/initscripts/init.d/common/beep similarity index 100% rename from src/initscripts/init.d/beep rename to src/initscripts/init.d/common/beep diff --git a/src/initscripts/init.d/checkfs b/src/initscripts/init.d/common/checkfs similarity index 100% rename from src/initscripts/init.d/checkfs rename to src/initscripts/init.d/common/checkfs diff --git a/src/initscripts/init.d/cleanfs b/src/initscripts/init.d/common/cleanfs similarity index 100% rename from src/initscripts/init.d/cleanfs rename to src/initscripts/init.d/common/cleanfs diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/common/collectd similarity index 100% rename from src/initscripts/init.d/collectd rename to src/initscripts/init.d/common/collectd diff --git a/src/initscripts/init.d/connectd b/src/initscripts/init.d/common/connectd similarity index 100% rename from src/initscripts/init.d/connectd rename to src/initscripts/init.d/common/connectd diff --git a/src/initscripts/init.d/console b/src/initscripts/init.d/common/console similarity index 100% rename from src/initscripts/init.d/console rename to src/initscripts/init.d/common/console diff --git a/src/initscripts/init.d/dhcp b/src/initscripts/init.d/common/dhcp similarity index 100% rename from src/initscripts/init.d/dhcp rename to src/initscripts/init.d/common/dhcp diff --git a/src/initscripts/init.d/dhcrelay b/src/initscripts/init.d/common/dhcrelay similarity index 100% rename from src/initscripts/init.d/dhcrelay rename to src/initscripts/init.d/common/dhcrelay diff --git a/src/initscripts/init.d/fcron b/src/initscripts/init.d/common/fcron similarity index 100% rename from src/initscripts/init.d/fcron rename to src/initscripts/init.d/common/fcron diff --git a/src/initscripts/init.d/fireinfo b/src/initscripts/init.d/common/fireinfo similarity index 100% rename from src/initscripts/init.d/fireinfo rename to src/initscripts/init.d/common/fireinfo diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/common/firewall similarity index 100% rename from src/initscripts/init.d/firewall rename to src/initscripts/init.d/common/firewall diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/common/firstsetup similarity index 100% rename from src/initscripts/init.d/firstsetup rename to src/initscripts/init.d/common/firstsetup diff --git a/src/initscripts/init.d/fsresize b/src/initscripts/init.d/common/fsresize similarity index 100% rename from src/initscripts/init.d/fsresize rename to src/initscripts/init.d/common/fsresize diff --git a/src/initscripts/init.d/functions b/src/initscripts/init.d/common/functions similarity index 100% rename from src/initscripts/init.d/functions rename to src/initscripts/init.d/common/functions diff --git a/src/initscripts/init.d/halt b/src/initscripts/init.d/common/halt similarity index 100% rename from src/initscripts/init.d/halt rename to src/initscripts/init.d/common/halt diff --git a/src/initscripts/init.d/ipsec b/src/initscripts/init.d/common/ipsec similarity index 100% rename from src/initscripts/init.d/ipsec rename to src/initscripts/init.d/common/ipsec diff --git a/src/initscripts/init.d/leds b/src/initscripts/init.d/common/leds similarity index 100% rename from src/initscripts/init.d/leds rename to src/initscripts/init.d/common/leds diff --git a/src/initscripts/init.d/localnet b/src/initscripts/init.d/common/localnet similarity index 100% rename from src/initscripts/init.d/localnet rename to src/initscripts/init.d/common/localnet diff --git a/src/initscripts/init.d/mISDN b/src/initscripts/init.d/common/mISDN similarity index 100% rename from src/initscripts/init.d/mISDN rename to src/initscripts/init.d/common/mISDN diff --git a/src/initscripts/init.d/modules b/src/initscripts/init.d/common/modules similarity index 100% rename from src/initscripts/init.d/modules rename to src/initscripts/init.d/common/modules diff --git a/src/initscripts/init.d/mountfs b/src/initscripts/init.d/common/mountfs similarity index 100% rename from src/initscripts/init.d/mountfs rename to src/initscripts/init.d/common/mountfs diff --git a/src/initscripts/init.d/mountkernfs b/src/initscripts/init.d/common/mountkernfs similarity index 100% rename from src/initscripts/init.d/mountkernfs rename to src/initscripts/init.d/common/mountkernfs diff --git a/src/initscripts/init.d/mounttmpfs b/src/initscripts/init.d/common/mounttmpfs similarity index 100% rename from src/initscripts/init.d/mounttmpfs rename to src/initscripts/init.d/common/mounttmpfs diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/common/network similarity index 100% rename from src/initscripts/init.d/network rename to src/initscripts/init.d/common/network diff --git a/src/initscripts/init.d/network-trigger b/src/initscripts/init.d/common/network-trigger similarity index 100% rename from src/initscripts/init.d/network-trigger rename to src/initscripts/init.d/common/network-trigger diff --git a/src/initscripts/init.d/ntp b/src/initscripts/init.d/common/ntp similarity index 100% rename from src/initscripts/init.d/ntp rename to src/initscripts/init.d/common/ntp diff --git a/src/initscripts/init.d/partresize b/src/initscripts/init.d/common/partresize similarity index 100% rename from src/initscripts/init.d/partresize rename to src/initscripts/init.d/common/partresize diff --git a/src/initscripts/init.d/random b/src/initscripts/init.d/common/random similarity index 100% rename from src/initscripts/init.d/random rename to src/initscripts/init.d/common/random diff --git a/src/initscripts/init.d/rc b/src/initscripts/init.d/common/rc similarity index 100% rename from src/initscripts/init.d/rc rename to src/initscripts/init.d/common/rc diff --git a/src/initscripts/init.d/reboot b/src/initscripts/init.d/common/reboot similarity index 100% rename from src/initscripts/init.d/reboot rename to src/initscripts/init.d/common/reboot diff --git a/src/initscripts/init.d/rngd b/src/initscripts/init.d/common/rngd similarity index 100% rename from src/initscripts/init.d/rngd rename to src/initscripts/init.d/common/rngd diff --git a/src/initscripts/init.d/sendsignals b/src/initscripts/init.d/common/sendsignals similarity index 100% rename from src/initscripts/init.d/sendsignals rename to src/initscripts/init.d/common/sendsignals diff --git a/src/initscripts/init.d/setclock b/src/initscripts/init.d/common/setclock similarity index 100% rename from src/initscripts/init.d/setclock rename to src/initscripts/init.d/common/setclock diff --git a/src/initscripts/init.d/smartenabler b/src/initscripts/init.d/common/smartenabler similarity index 100% rename from src/initscripts/init.d/smartenabler rename to src/initscripts/init.d/common/smartenabler diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/common/snort similarity index 100% rename from src/initscripts/init.d/snort rename to src/initscripts/init.d/common/snort diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/common/squid similarity index 100% rename from src/initscripts/init.d/squid rename to src/initscripts/init.d/common/squid diff --git a/src/initscripts/init.d/sshd b/src/initscripts/init.d/common/sshd similarity index 100% rename from src/initscripts/init.d/sshd rename to src/initscripts/init.d/common/sshd diff --git a/src/initscripts/init.d/static-routes b/src/initscripts/init.d/common/static-routes similarity index 100% rename from src/initscripts/init.d/static-routes rename to src/initscripts/init.d/common/static-routes diff --git a/src/initscripts/init.d/swap b/src/initscripts/init.d/common/swap similarity index 100% rename from src/initscripts/init.d/swap rename to src/initscripts/init.d/common/swap diff --git a/src/initscripts/init.d/swconfig b/src/initscripts/init.d/common/swconfig similarity index 100% rename from src/initscripts/init.d/swconfig rename to src/initscripts/init.d/common/swconfig diff --git a/src/initscripts/init.d/sysctl b/src/initscripts/init.d/common/sysctl similarity index 100% rename from src/initscripts/init.d/sysctl rename to src/initscripts/init.d/common/sysctl diff --git a/src/initscripts/init.d/sysklogd b/src/initscripts/init.d/common/sysklogd similarity index 100% rename from src/initscripts/init.d/sysklogd rename to src/initscripts/init.d/common/sysklogd diff --git a/src/initscripts/init.d/template b/src/initscripts/init.d/common/template similarity index 100% rename from src/initscripts/init.d/template rename to src/initscripts/init.d/common/template diff --git a/src/initscripts/init.d/udev b/src/initscripts/init.d/common/udev similarity index 100% rename from src/initscripts/init.d/udev rename to src/initscripts/init.d/common/udev diff --git a/src/initscripts/init.d/udev_retry b/src/initscripts/init.d/common/udev_retry similarity index 100% rename from src/initscripts/init.d/udev_retry rename to src/initscripts/init.d/common/udev_retry diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/common/unbound similarity index 100% rename from src/initscripts/init.d/unbound rename to src/initscripts/init.d/common/unbound diff --git a/src/initscripts/init.d/upnpd b/src/initscripts/init.d/common/upnpd similarity index 100% rename from src/initscripts/init.d/upnpd rename to src/initscripts/init.d/common/upnpd diff --git a/src/initscripts/init.d/vnstat b/src/initscripts/init.d/common/vnstat similarity index 100% rename from src/initscripts/init.d/vnstat rename to src/initscripts/init.d/common/vnstat diff --git a/src/initscripts/init.d/waitdrives b/src/initscripts/init.d/common/waitdrives similarity index 100% rename from src/initscripts/init.d/waitdrives rename to src/initscripts/init.d/common/waitdrives diff --git a/src/initscripts/init.d/wlanclient b/src/initscripts/init.d/common/wlanclient similarity index 100% rename from src/initscripts/init.d/wlanclient rename to src/initscripts/init.d/common/wlanclient From 1d8dab5404b4e1a662e6f0398a552f8f6251bee6 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 11:18:36 +0100 Subject: [PATCH 02/63] Move the initscript of the cups package into the packages directory Signed-off-by: Jonatan Schlag --- lfs/cups | 2 +- src/initscripts/init.d/{ => packages}/cups | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/initscripts/init.d/{ => packages}/cups (100%) diff --git a/lfs/cups b/lfs/cups index 49b275a65..c7e2549e7 100644 --- a/lfs/cups +++ b/lfs/cups @@ -91,7 +91,7 @@ $(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 -v -m 754 $(DIR_SRC)/src/initscripts/init.d/packages/cups /etc/rc.d/init.d cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/ @rm -rf $(DIR_APP) diff --git a/src/initscripts/init.d/cups b/src/initscripts/init.d/packages/cups similarity index 100% rename from src/initscripts/init.d/cups rename to src/initscripts/init.d/packages/cups From cb144b4f8a854d911401b9ed6d7ef2916eb2dc50 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 11:21:17 +0100 Subject: [PATCH 03/63] Move the initscripts of the libvirt package into the packages directory Signed-off-by: Jonatan Schlag --- lfs/libvirt | 4 ++-- src/initscripts/init.d/{ => packages}/libvirtd | 0 src/initscripts/init.d/{ => packages}/virtlogd | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/initscripts/init.d/{ => packages}/libvirtd (100%) rename src/initscripts/init.d/{ => packages}/virtlogd (100%) diff --git a/lfs/libvirt b/lfs/libvirt index 996d32ecd..d14502997 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -89,8 +89,8 @@ $(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 -v -m 754 $(DIR_SRC)/src/initscripts/init.d/packages/libvirtd /etc/rc.d/init.d/libvirtd + install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/packages/virtlogd /etc/rc.d/init.d/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/src/initscripts/init.d/libvirtd b/src/initscripts/init.d/packages/libvirtd similarity index 100% rename from src/initscripts/init.d/libvirtd rename to src/initscripts/init.d/packages/libvirtd diff --git a/src/initscripts/init.d/virtlogd b/src/initscripts/init.d/packages/virtlogd similarity index 100% rename from src/initscripts/init.d/virtlogd rename to src/initscripts/init.d/packages/virtlogd From c6060f2dcf49f2a20406485d0507cb14a513b44b Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 11:24:00 +0100 Subject: [PATCH 04/63] Move the initscript of the hostapd package into the packages directory Signed-off-by: Jonatan Schlag --- lfs/hostapd | 2 ++ src/initscripts/init.d/{ => packages}/hostapd | 0 2 files changed, 2 insertions(+) rename src/initscripts/init.d/{ => packages}/hostapd (100%) diff --git a/lfs/hostapd b/lfs/hostapd index a4fe99a92..5e88b6410 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 + install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/packages/hostapd /etc/rc.d/init.d/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/src/initscripts/init.d/hostapd b/src/initscripts/init.d/packages/hostapd similarity index 100% rename from src/initscripts/init.d/hostapd rename to src/initscripts/init.d/packages/hostapd From 33f53d55ccec436a6cbd80ea469ea4a558528798 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 11:54:00 +0100 Subject: [PATCH 05/63] Move all initscripts for the system to src/initscripts/system Signed-off-by: Jonatan Schlag --- lfs/initscripts | 2 +- src/initscripts/{init.d/common => system}/acpid | 0 src/initscripts/{init.d/common => system}/apache | 0 src/initscripts/{init.d/common => system}/beep | 0 src/initscripts/{init.d/common => system}/checkfs | 0 src/initscripts/{init.d/common => system}/cleanfs | 0 src/initscripts/{init.d/common => system}/collectd | 0 src/initscripts/{init.d/common => system}/connectd | 0 src/initscripts/{init.d/common => system}/console | 0 src/initscripts/{init.d/common => system}/dhcp | 0 src/initscripts/{init.d/common => system}/dhcrelay | 0 src/initscripts/{init.d/common => system}/fcron | 0 src/initscripts/{init.d/common => system}/fireinfo | 0 src/initscripts/{init.d/common => system}/firewall | 0 src/initscripts/{init.d/common => system}/firstsetup | 0 src/initscripts/{init.d/common => system}/fsresize | 0 src/initscripts/{init.d/common => system}/functions | 0 src/initscripts/{init.d/common => system}/halt | 0 src/initscripts/{init.d/common => system}/ipsec | 0 src/initscripts/{init.d/common => system}/leds | 0 src/initscripts/{init.d/common => system}/localnet | 0 src/initscripts/{init.d/common => system}/mISDN | 0 src/initscripts/{init.d/common => system}/modules | 0 src/initscripts/{init.d/common => system}/mountfs | 0 src/initscripts/{init.d/common => system}/mountkernfs | 0 src/initscripts/{init.d/common => system}/mounttmpfs | 0 src/initscripts/{init.d/common => system}/network | 0 src/initscripts/{init.d/common => system}/network-trigger | 0 src/initscripts/{init.d/common => system}/ntp | 0 src/initscripts/{init.d/common => system}/partresize | 0 src/initscripts/{init.d/common => system}/random | 0 src/initscripts/{init.d/common => system}/rc | 0 src/initscripts/{init.d/common => system}/reboot | 0 src/initscripts/{init.d/common => system}/rngd | 0 src/initscripts/{init.d/common => system}/sendsignals | 0 src/initscripts/{init.d/common => system}/setclock | 0 src/initscripts/{init.d/common => system}/smartenabler | 0 src/initscripts/{init.d/common => system}/snort | 0 src/initscripts/{init.d/common => system}/squid | 0 src/initscripts/{init.d/common => system}/sshd | 0 src/initscripts/{init.d/common => system}/static-routes | 0 src/initscripts/{init.d/common => system}/swap | 0 src/initscripts/{init.d/common => system}/swconfig | 0 src/initscripts/{init.d/common => system}/sysctl | 0 src/initscripts/{init.d/common => system}/sysklogd | 0 src/initscripts/{init.d/common => system}/template | 0 src/initscripts/{init.d/common => system}/udev | 0 src/initscripts/{init.d/common => system}/udev_retry | 0 src/initscripts/{init.d/common => system}/unbound | 0 src/initscripts/{init.d/common => system}/upnpd | 0 src/initscripts/{init.d/common => system}/vnstat | 0 src/initscripts/{init.d/common => system}/waitdrives | 0 src/initscripts/{init.d/common => system}/wlanclient | 0 53 files changed, 1 insertion(+), 1 deletion(-) rename src/initscripts/{init.d/common => system}/acpid (100%) rename src/initscripts/{init.d/common => system}/apache (100%) rename src/initscripts/{init.d/common => system}/beep (100%) rename src/initscripts/{init.d/common => system}/checkfs (100%) rename src/initscripts/{init.d/common => system}/cleanfs (100%) rename src/initscripts/{init.d/common => system}/collectd (100%) rename src/initscripts/{init.d/common => system}/connectd (100%) rename src/initscripts/{init.d/common => system}/console (100%) rename src/initscripts/{init.d/common => system}/dhcp (100%) rename src/initscripts/{init.d/common => system}/dhcrelay (100%) rename src/initscripts/{init.d/common => system}/fcron (100%) rename src/initscripts/{init.d/common => system}/fireinfo (100%) rename src/initscripts/{init.d/common => system}/firewall (100%) rename src/initscripts/{init.d/common => system}/firstsetup (100%) rename src/initscripts/{init.d/common => system}/fsresize (100%) rename src/initscripts/{init.d/common => system}/functions (100%) rename src/initscripts/{init.d/common => system}/halt (100%) rename src/initscripts/{init.d/common => system}/ipsec (100%) rename src/initscripts/{init.d/common => system}/leds (100%) rename src/initscripts/{init.d/common => system}/localnet (100%) rename src/initscripts/{init.d/common => system}/mISDN (100%) rename src/initscripts/{init.d/common => system}/modules (100%) rename src/initscripts/{init.d/common => system}/mountfs (100%) rename src/initscripts/{init.d/common => system}/mountkernfs (100%) rename src/initscripts/{init.d/common => system}/mounttmpfs (100%) rename src/initscripts/{init.d/common => system}/network (100%) rename src/initscripts/{init.d/common => system}/network-trigger (100%) rename src/initscripts/{init.d/common => system}/ntp (100%) rename src/initscripts/{init.d/common => system}/partresize (100%) rename src/initscripts/{init.d/common => system}/random (100%) rename src/initscripts/{init.d/common => system}/rc (100%) rename src/initscripts/{init.d/common => system}/reboot (100%) rename src/initscripts/{init.d/common => system}/rngd (100%) rename src/initscripts/{init.d/common => system}/sendsignals (100%) rename src/initscripts/{init.d/common => system}/setclock (100%) rename src/initscripts/{init.d/common => system}/smartenabler (100%) rename src/initscripts/{init.d/common => system}/snort (100%) rename src/initscripts/{init.d/common => system}/squid (100%) rename src/initscripts/{init.d/common => system}/sshd (100%) rename src/initscripts/{init.d/common => system}/static-routes (100%) rename src/initscripts/{init.d/common => system}/swap (100%) rename src/initscripts/{init.d/common => system}/swconfig (100%) rename src/initscripts/{init.d/common => system}/sysctl (100%) rename src/initscripts/{init.d/common => system}/sysklogd (100%) rename src/initscripts/{init.d/common => system}/template (100%) rename src/initscripts/{init.d/common => system}/udev (100%) rename src/initscripts/{init.d/common => system}/udev_retry (100%) rename src/initscripts/{init.d/common => system}/unbound (100%) rename src/initscripts/{init.d/common => system}/upnpd (100%) rename src/initscripts/{init.d/common => system}/vnstat (100%) rename src/initscripts/{init.d/common => system}/waitdrives (100%) rename src/initscripts/{init.d/common => system}/wlanclient (100%) diff --git a/lfs/initscripts b/lfs/initscripts index 61d08df4c..dd29a8191 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -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/common/*; 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 diff --git a/src/initscripts/init.d/common/acpid b/src/initscripts/system/acpid similarity index 100% rename from src/initscripts/init.d/common/acpid rename to src/initscripts/system/acpid diff --git a/src/initscripts/init.d/common/apache b/src/initscripts/system/apache similarity index 100% rename from src/initscripts/init.d/common/apache rename to src/initscripts/system/apache diff --git a/src/initscripts/init.d/common/beep b/src/initscripts/system/beep similarity index 100% rename from src/initscripts/init.d/common/beep rename to src/initscripts/system/beep diff --git a/src/initscripts/init.d/common/checkfs b/src/initscripts/system/checkfs similarity index 100% rename from src/initscripts/init.d/common/checkfs rename to src/initscripts/system/checkfs diff --git a/src/initscripts/init.d/common/cleanfs b/src/initscripts/system/cleanfs similarity index 100% rename from src/initscripts/init.d/common/cleanfs rename to src/initscripts/system/cleanfs diff --git a/src/initscripts/init.d/common/collectd b/src/initscripts/system/collectd similarity index 100% rename from src/initscripts/init.d/common/collectd rename to src/initscripts/system/collectd diff --git a/src/initscripts/init.d/common/connectd b/src/initscripts/system/connectd similarity index 100% rename from src/initscripts/init.d/common/connectd rename to src/initscripts/system/connectd diff --git a/src/initscripts/init.d/common/console b/src/initscripts/system/console similarity index 100% rename from src/initscripts/init.d/common/console rename to src/initscripts/system/console diff --git a/src/initscripts/init.d/common/dhcp b/src/initscripts/system/dhcp similarity index 100% rename from src/initscripts/init.d/common/dhcp rename to src/initscripts/system/dhcp diff --git a/src/initscripts/init.d/common/dhcrelay b/src/initscripts/system/dhcrelay similarity index 100% rename from src/initscripts/init.d/common/dhcrelay rename to src/initscripts/system/dhcrelay diff --git a/src/initscripts/init.d/common/fcron b/src/initscripts/system/fcron similarity index 100% rename from src/initscripts/init.d/common/fcron rename to src/initscripts/system/fcron diff --git a/src/initscripts/init.d/common/fireinfo b/src/initscripts/system/fireinfo similarity index 100% rename from src/initscripts/init.d/common/fireinfo rename to src/initscripts/system/fireinfo diff --git a/src/initscripts/init.d/common/firewall b/src/initscripts/system/firewall similarity index 100% rename from src/initscripts/init.d/common/firewall rename to src/initscripts/system/firewall diff --git a/src/initscripts/init.d/common/firstsetup b/src/initscripts/system/firstsetup similarity index 100% rename from src/initscripts/init.d/common/firstsetup rename to src/initscripts/system/firstsetup diff --git a/src/initscripts/init.d/common/fsresize b/src/initscripts/system/fsresize similarity index 100% rename from src/initscripts/init.d/common/fsresize rename to src/initscripts/system/fsresize diff --git a/src/initscripts/init.d/common/functions b/src/initscripts/system/functions similarity index 100% rename from src/initscripts/init.d/common/functions rename to src/initscripts/system/functions diff --git a/src/initscripts/init.d/common/halt b/src/initscripts/system/halt similarity index 100% rename from src/initscripts/init.d/common/halt rename to src/initscripts/system/halt diff --git a/src/initscripts/init.d/common/ipsec b/src/initscripts/system/ipsec similarity index 100% rename from src/initscripts/init.d/common/ipsec rename to src/initscripts/system/ipsec diff --git a/src/initscripts/init.d/common/leds b/src/initscripts/system/leds similarity index 100% rename from src/initscripts/init.d/common/leds rename to src/initscripts/system/leds diff --git a/src/initscripts/init.d/common/localnet b/src/initscripts/system/localnet similarity index 100% rename from src/initscripts/init.d/common/localnet rename to src/initscripts/system/localnet diff --git a/src/initscripts/init.d/common/mISDN b/src/initscripts/system/mISDN similarity index 100% rename from src/initscripts/init.d/common/mISDN rename to src/initscripts/system/mISDN diff --git a/src/initscripts/init.d/common/modules b/src/initscripts/system/modules similarity index 100% rename from src/initscripts/init.d/common/modules rename to src/initscripts/system/modules diff --git a/src/initscripts/init.d/common/mountfs b/src/initscripts/system/mountfs similarity index 100% rename from src/initscripts/init.d/common/mountfs rename to src/initscripts/system/mountfs diff --git a/src/initscripts/init.d/common/mountkernfs b/src/initscripts/system/mountkernfs similarity index 100% rename from src/initscripts/init.d/common/mountkernfs rename to src/initscripts/system/mountkernfs diff --git a/src/initscripts/init.d/common/mounttmpfs b/src/initscripts/system/mounttmpfs similarity index 100% rename from src/initscripts/init.d/common/mounttmpfs rename to src/initscripts/system/mounttmpfs diff --git a/src/initscripts/init.d/common/network b/src/initscripts/system/network similarity index 100% rename from src/initscripts/init.d/common/network rename to src/initscripts/system/network diff --git a/src/initscripts/init.d/common/network-trigger b/src/initscripts/system/network-trigger similarity index 100% rename from src/initscripts/init.d/common/network-trigger rename to src/initscripts/system/network-trigger diff --git a/src/initscripts/init.d/common/ntp b/src/initscripts/system/ntp similarity index 100% rename from src/initscripts/init.d/common/ntp rename to src/initscripts/system/ntp diff --git a/src/initscripts/init.d/common/partresize b/src/initscripts/system/partresize similarity index 100% rename from src/initscripts/init.d/common/partresize rename to src/initscripts/system/partresize diff --git a/src/initscripts/init.d/common/random b/src/initscripts/system/random similarity index 100% rename from src/initscripts/init.d/common/random rename to src/initscripts/system/random diff --git a/src/initscripts/init.d/common/rc b/src/initscripts/system/rc similarity index 100% rename from src/initscripts/init.d/common/rc rename to src/initscripts/system/rc diff --git a/src/initscripts/init.d/common/reboot b/src/initscripts/system/reboot similarity index 100% rename from src/initscripts/init.d/common/reboot rename to src/initscripts/system/reboot diff --git a/src/initscripts/init.d/common/rngd b/src/initscripts/system/rngd similarity index 100% rename from src/initscripts/init.d/common/rngd rename to src/initscripts/system/rngd diff --git a/src/initscripts/init.d/common/sendsignals b/src/initscripts/system/sendsignals similarity index 100% rename from src/initscripts/init.d/common/sendsignals rename to src/initscripts/system/sendsignals diff --git a/src/initscripts/init.d/common/setclock b/src/initscripts/system/setclock similarity index 100% rename from src/initscripts/init.d/common/setclock rename to src/initscripts/system/setclock diff --git a/src/initscripts/init.d/common/smartenabler b/src/initscripts/system/smartenabler similarity index 100% rename from src/initscripts/init.d/common/smartenabler rename to src/initscripts/system/smartenabler diff --git a/src/initscripts/init.d/common/snort b/src/initscripts/system/snort similarity index 100% rename from src/initscripts/init.d/common/snort rename to src/initscripts/system/snort diff --git a/src/initscripts/init.d/common/squid b/src/initscripts/system/squid similarity index 100% rename from src/initscripts/init.d/common/squid rename to src/initscripts/system/squid diff --git a/src/initscripts/init.d/common/sshd b/src/initscripts/system/sshd similarity index 100% rename from src/initscripts/init.d/common/sshd rename to src/initscripts/system/sshd diff --git a/src/initscripts/init.d/common/static-routes b/src/initscripts/system/static-routes similarity index 100% rename from src/initscripts/init.d/common/static-routes rename to src/initscripts/system/static-routes diff --git a/src/initscripts/init.d/common/swap b/src/initscripts/system/swap similarity index 100% rename from src/initscripts/init.d/common/swap rename to src/initscripts/system/swap diff --git a/src/initscripts/init.d/common/swconfig b/src/initscripts/system/swconfig similarity index 100% rename from src/initscripts/init.d/common/swconfig rename to src/initscripts/system/swconfig diff --git a/src/initscripts/init.d/common/sysctl b/src/initscripts/system/sysctl similarity index 100% rename from src/initscripts/init.d/common/sysctl rename to src/initscripts/system/sysctl diff --git a/src/initscripts/init.d/common/sysklogd b/src/initscripts/system/sysklogd similarity index 100% rename from src/initscripts/init.d/common/sysklogd rename to src/initscripts/system/sysklogd diff --git a/src/initscripts/init.d/common/template b/src/initscripts/system/template similarity index 100% rename from src/initscripts/init.d/common/template rename to src/initscripts/system/template diff --git a/src/initscripts/init.d/common/udev b/src/initscripts/system/udev similarity index 100% rename from src/initscripts/init.d/common/udev rename to src/initscripts/system/udev diff --git a/src/initscripts/init.d/common/udev_retry b/src/initscripts/system/udev_retry similarity index 100% rename from src/initscripts/init.d/common/udev_retry rename to src/initscripts/system/udev_retry diff --git a/src/initscripts/init.d/common/unbound b/src/initscripts/system/unbound similarity index 100% rename from src/initscripts/init.d/common/unbound rename to src/initscripts/system/unbound diff --git a/src/initscripts/init.d/common/upnpd b/src/initscripts/system/upnpd similarity index 100% rename from src/initscripts/init.d/common/upnpd rename to src/initscripts/system/upnpd diff --git a/src/initscripts/init.d/common/vnstat b/src/initscripts/system/vnstat similarity index 100% rename from src/initscripts/init.d/common/vnstat rename to src/initscripts/system/vnstat diff --git a/src/initscripts/init.d/common/waitdrives b/src/initscripts/system/waitdrives similarity index 100% rename from src/initscripts/init.d/common/waitdrives rename to src/initscripts/system/waitdrives diff --git a/src/initscripts/init.d/common/wlanclient b/src/initscripts/system/wlanclient similarity index 100% rename from src/initscripts/init.d/common/wlanclient rename to src/initscripts/system/wlanclient From 629fcb1d47d686c6182b3ed9e0e49650f40cc6e1 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 11:57:20 +0100 Subject: [PATCH 06/63] Move network initscripts to src/initscripts/networking Signed-off-by: Jonatan Schlag --- lfs/initscripts | 6 +++--- src/initscripts/{init.d => }/networking/any | 0 src/initscripts/{init.d => }/networking/dhcpcd.exe | 0 src/initscripts/{init.d => }/networking/functions.network | 0 src/initscripts/{init.d => }/networking/red | 0 .../networking/red.down/05-update-dns-forwarders | 0 src/initscripts/{init.d => }/networking/red.down/10-ipsec | 0 .../{init.d => }/networking/red.down/10-miniupnpd | 0 src/initscripts/{init.d => }/networking/red.down/10-ovpn | 0 .../{init.d => }/networking/red.down/10-static-routes | 0 .../{init.d => }/networking/red.down/20-firewall | 0 .../{init.d => }/networking/red.up/01-conntrack-cleanup | 0 .../{init.d => }/networking/red.up/05-update-dns-forwarders | 0 src/initscripts/{init.d => }/networking/red.up/10-miniupnpd | 0 src/initscripts/{init.d => }/networking/red.up/10-multicast | 0 .../{init.d => }/networking/red.up/10-static-routes | 0 src/initscripts/{init.d => }/networking/red.up/20-firewall | 0 src/initscripts/{init.d => }/networking/red.up/30-ddns | 0 src/initscripts/{init.d => }/networking/red.up/35-guardian | 0 src/initscripts/{init.d => }/networking/red.up/50-ipsec | 0 src/initscripts/{init.d => }/networking/red.up/50-ovpn | 0 src/initscripts/{init.d => }/networking/red.up/98-leds | 0 src/initscripts/{init.d => }/networking/red.up/99-fireinfo | 0 .../{init.d => }/networking/red.up/99-geoip-database | 0 .../{init.d => }/networking/red.up/99-pakfire-update | 0 src/initscripts/{init.d => }/networking/wpa_supplicant.exe | 0 26 files changed, 3 insertions(+), 3 deletions(-) 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%) diff --git a/lfs/initscripts b/lfs/initscripts index dd29a8191..ef7114c90 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -69,17 +69,17 @@ $(TARGET) : 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/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 From 38888b3d927ddd5b47de337cf197494d4a53de7b Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 12:20:09 +0100 Subject: [PATCH 07/63] 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 --- lfs/Config | 7 +++++++ lfs/alsa | 2 ++ src/initscripts/{init.d => packages}/alsa | 0 3 files changed, 9 insertions(+) rename src/initscripts/{init.d => packages}/alsa (100%) diff --git a/lfs/Config b/lfs/Config index 4de8bd34c..3101d8b5a 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 b9c3bb452..72ea70d20 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/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 From be2732c2171613d98f830ef0f6da313424060c3b Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 12:26:54 +0100 Subject: [PATCH 08/63] Install initscript with the new macro - Move the cups initscript to src/initscripts/packages --- lfs/cups | 3 ++- src/initscripts/{init.d => }/packages/cups | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename src/initscripts/{init.d => }/packages/cups (100%) diff --git a/lfs/cups b/lfs/cups index c7e2549e7..f94bb6d24 100644 --- 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/packages/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/src/initscripts/init.d/packages/cups b/src/initscripts/packages/cups similarity index 100% rename from src/initscripts/init.d/packages/cups rename to src/initscripts/packages/cups From 6a4df2fd3b375c77bbdb99a0bb8b952f7116a3f8 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 13:13:49 +0100 Subject: [PATCH 09/63] Move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/hostapd | 2 +- src/initscripts/{init.d => }/packages/hostapd | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/initscripts/{init.d => }/packages/hostapd (100%) diff --git a/lfs/hostapd b/lfs/hostapd index 5e88b6410..1a2436caa 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -84,7 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/hostapd && make install install -v -m 644 $(DIR_SRC)/config/backup/includes/hostapd /var/ipfire/backup/addons/includes/hostapd # install initscript - install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/packages/hostapd /etc/rc.d/init.d/hostapd + $(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/src/initscripts/init.d/packages/hostapd b/src/initscripts/packages/hostapd similarity index 100% rename from src/initscripts/init.d/packages/hostapd rename to src/initscripts/packages/hostapd From c8b7d517d0e687d72bc71816f0f26581a0145edf Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 13:16:12 +0100 Subject: [PATCH 10/63] Libvirt: move initscripts to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/libvirt | 5 +++-- src/initscripts/{init.d => }/packages/libvirtd | 0 src/initscripts/{init.d => }/packages/virtlogd | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename src/initscripts/{init.d => }/packages/libvirtd (100%) rename src/initscripts/{init.d => }/packages/virtlogd (100%) diff --git a/lfs/libvirt b/lfs/libvirt index d14502997..5a9548d49 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/packages/libvirtd /etc/rc.d/init.d/libvirtd - install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/packages/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/src/initscripts/init.d/packages/libvirtd b/src/initscripts/packages/libvirtd similarity index 100% rename from src/initscripts/init.d/packages/libvirtd rename to src/initscripts/packages/libvirtd diff --git a/src/initscripts/init.d/packages/virtlogd b/src/initscripts/packages/virtlogd similarity index 100% rename from src/initscripts/init.d/packages/virtlogd rename to src/initscripts/packages/virtlogd From 1f68460f5afd37e4a58959a006e09f10fe1c0cff Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 16:11:57 +0100 Subject: [PATCH 11/63] watchdog: move initscripts to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/watchdog | 2 ++ src/initscripts/{init.d => packages}/watchdog | 0 2 files changed, 2 insertions(+) rename src/initscripts/{init.d => packages}/watchdog (100%) diff --git a/lfs/watchdog b/lfs/watchdog index 70bf6921e..9bef90728 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/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 From db8a26e71877cc698ead7cc6191a020eaa5648bc Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 16:15:06 +0100 Subject: [PATCH 12/63] nfs: move initscripts to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/nfs | 2 ++ src/initscripts/{init.d => packages}/nfs-server | 0 2 files changed, 2 insertions(+) rename src/initscripts/{init.d => packages}/nfs-server (100%) diff --git a/lfs/nfs b/lfs/nfs index 23a17739e..2a8e331b5 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/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 From afb143bd7cd9cdf1c68e33f3f7e2f9cad1900c22 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 17:37:23 +0100 Subject: [PATCH 13/63] clamav: move initscripts to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/clamav | 3 ++- src/initscripts/{init.d => packages}/clamav | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename src/initscripts/{init.d => packages}/clamav (100%) diff --git a/lfs/clamav b/lfs/clamav index 2cd5e493b..650faecbe 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/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 From 7db55a67798656f851689863d8401839c8f385a2 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 19:48:38 +0100 Subject: [PATCH 14/63] tor: move initscripts to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/tor | 3 +++ src/initscripts/{init.d => packages}/tor | 0 2 files changed, 3 insertions(+) rename src/initscripts/{init.d => packages}/tor (100%) diff --git a/lfs/tor b/lfs/tor index be812e021..4da2c7c73 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/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 From dbb35fa6a4c969696411334280d2e688fc79062e Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 19:50:13 +0100 Subject: [PATCH 15/63] freeradius: move initscripts to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/freeradius | 3 +++ src/initscripts/{init.d => packages}/freeradius | 0 2 files changed, 3 insertions(+) rename src/initscripts/{init.d => packages}/freeradius (100%) diff --git a/lfs/freeradius b/lfs/freeradius index d9a80c638..a07a535ab 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/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 From c08b75dbb5fbd3b47adcc0a39bea5d7b1752e948 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 22 Feb 2017 19:51:26 +0100 Subject: [PATCH 16/63] xinetd: move initscripts to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/xinetd | 4 ++++ src/initscripts/{init.d => packages}/xinetd | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/xinetd (100%) diff --git a/lfs/xinetd b/lfs/xinetd index 62f34eabb..d3b577b5c 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/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 From f22bfcf48c6e3014615254922cb4515afec172a7 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Thu, 23 Feb 2017 14:21:57 +0100 Subject: [PATCH 17/63] openvmtools: move initscripts to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/openvmtools | 2 ++ src/initscripts/{init.d => packages}/openvmtools | 0 2 files changed, 2 insertions(+) rename src/initscripts/{init.d => packages}/openvmtools (100%) diff --git a/lfs/openvmtools b/lfs/openvmtools index 72101d526..1cf9427fe 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/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 From df7f06eceb31dc8c0392b84d91dc24756bebe947 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Thu, 23 Feb 2017 14:23:22 +0100 Subject: [PATCH 18/63] rpcbind: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/rpcbind | 2 ++ src/initscripts/{init.d => packages}/rpcbind | 0 2 files changed, 2 insertions(+) rename src/initscripts/{init.d => packages}/rpcbind (100%) diff --git a/lfs/rpcbind b/lfs/rpcbind index e7f9eff08..046121f36 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/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 From ba43a6fee28b7e00c4f5cead38107b3d0300a242 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Thu, 23 Feb 2017 14:25:06 +0100 Subject: [PATCH 19/63] guardian: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/guardian | 3 +++ src/initscripts/{init.d => packages}/guardian | 0 2 files changed, 3 insertions(+) rename src/initscripts/{init.d => packages}/guardian (100%) diff --git a/lfs/guardian b/lfs/guardian index d3634195e..2120a08a4 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/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 From e7301348846afeb0e7f27d801bac2f19763e1c53 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Thu, 23 Feb 2017 14:32:08 +0100 Subject: [PATCH 20/63] asterisk: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/asterisk | 3 +++ src/initscripts/{init.d => packages}/asterisk | 0 2 files changed, 3 insertions(+) rename src/initscripts/{init.d => packages}/asterisk (100%) diff --git a/lfs/asterisk b/lfs/asterisk index a0276bc56..31f6ec0fe 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/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 From c5480346b1ace5d630d5a82e73077bd48e9bf42c Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 24 Feb 2017 12:11:53 +0100 Subject: [PATCH 21/63] dnsdist: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/dnsdist | 4 ++++ src/initscripts/{init.d => packages}/dnsdist | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/dnsdist (100%) diff --git a/lfs/dnsdist b/lfs/dnsdist index a5d9fea9f..aeb11c87a 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/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 From 5f53bd1c13f6ef6387313768bd8cd250499f66cb Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 24 Feb 2017 12:12:52 +0100 Subject: [PATCH 22/63] bluetooth: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/bluetooth | 4 ++++ src/initscripts/{init.d => packages}/bluetooth | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/bluetooth (100%) diff --git a/lfs/bluetooth b/lfs/bluetooth index dc5eec7ea..2c5780954 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/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 From e804a70256d72c7ad76913bde373f2f97f84c21f Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 24 Feb 2017 12:14:18 +0100 Subject: [PATCH 23/63] haproxy: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/haproxy | 5 ++--- src/initscripts/{init.d => packages}/haproxy | 0 2 files changed, 2 insertions(+), 3 deletions(-) rename src/initscripts/{init.d => packages}/haproxy (100%) diff --git a/lfs/haproxy b/lfs/haproxy index 4af227307..0e5a067f8 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/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 From 47b6926102a00809aa8929ddd86907aa168850a0 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 24 Feb 2017 12:15:23 +0100 Subject: [PATCH 24/63] keepalived: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/keepalived | 6 +++--- src/initscripts/{init.d => packages}/keepalived | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename src/initscripts/{init.d => packages}/keepalived (100%) diff --git a/lfs/keepalived b/lfs/keepalived index 2054a5421..257ceb2d9 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/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 From 939fbafccdacfb0c078daa166829311366257b8c Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 24 Feb 2017 12:16:35 +0100 Subject: [PATCH 25/63] mysql: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/mysql | 4 ++++ src/initscripts/{init.d => packages}/mysql | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/mysql (100%) diff --git a/lfs/mysql b/lfs/mysql index edcd651f8..089516efa 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/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 From e215aaed48d8dfe3c7f6dd2bc649fb5b7547eef3 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 24 Feb 2017 15:54:19 +0100 Subject: [PATCH 26/63] samba: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/samba | 3 +++ src/initscripts/{init.d => packages}/samba | 0 2 files changed, 3 insertions(+) rename src/initscripts/{init.d => packages}/samba (100%) diff --git a/lfs/samba b/lfs/samba index 74a1b769e..076152f48 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/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 From 610b34069c6f6ebd857f5cd0c4d3b70e4b4c0143 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 24 Feb 2017 15:55:05 +0100 Subject: [PATCH 27/63] nut: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/nut | 4 ++++ src/initscripts/{init.d => packages}/nut | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/nut (100%) diff --git a/lfs/nut b/lfs/nut index c64c5a26b..2045dce6c 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/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 From 8fa8cd3b7e10ee7564465de4af60164c32a813ab Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 24 Feb 2017 15:56:38 +0100 Subject: [PATCH 28/63] sane: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/sane | 4 ++++ src/initscripts/{init.d => packages}/sane | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/sane (100%) diff --git a/lfs/sane b/lfs/sane index 64f337592..9e456f017 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/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 From f79869bf421437654fde325b4eb262ebe3dbe292 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 24 Feb 2017 15:58:01 +0100 Subject: [PATCH 29/63] apcupsd: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/apcupsd | 4 ++++ src/initscripts/{init.d => packages}/apcupsd | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/apcupsd (100%) diff --git a/lfs/apcupsd b/lfs/apcupsd index 4e9137b11..1d8e0ff40 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/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 From dc9baa5496ea41b890927098e222e297e99a1db0 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 24 Feb 2017 19:11:00 +0100 Subject: [PATCH 30/63] transmission: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/transmission | 3 +++ src/initscripts/{init.d => packages}/transmission | 0 2 files changed, 3 insertions(+) rename src/initscripts/{init.d => packages}/transmission (100%) diff --git a/lfs/transmission b/lfs/transmission index 36eb3c424..79ebaa1f9 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/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 From 74eaa64e4ba95d94a387e8756d954a1b5b0f9b13 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 24 Feb 2017 19:12:22 +0100 Subject: [PATCH 31/63] pound: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/pound | 4 ++++ src/initscripts/{init.d => packages}/pound | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/pound (100%) diff --git a/lfs/pound b/lfs/pound index 3860122a9..b4206d0e5 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/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 From 8ab50dba65e02cbfd4edb2ce81e32caef22ff193 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Sat, 25 Feb 2017 12:59:40 +0100 Subject: [PATCH 32/63] motion: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/motion | 3 +++ src/initscripts/{init.d => packages}/motion | 0 2 files changed, 3 insertions(+) rename src/initscripts/{init.d => packages}/motion (100%) diff --git a/lfs/motion b/lfs/motion index 39c6b7352..a09133887 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/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 From 87f382731fecd9818bf81e4fae8450107b601cd4 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Sat, 25 Feb 2017 13:01:08 +0100 Subject: [PATCH 33/63] cpufrequtils: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/cpufrequtils | 4 ++++ src/initscripts/{init.d => packages}/cpufreq | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/cpufreq (100%) diff --git a/lfs/cpufrequtils b/lfs/cpufrequtils index 5a82c33a5..d558efa61 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/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 From a0851cf32881fecd7b00610c0fc89f46de67d376 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Sat, 25 Feb 2017 13:02:41 +0100 Subject: [PATCH 34/63] stunnel: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/stunnel | 4 ++++ src/initscripts/{init.d => packages}/stunnel | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/stunnel (100%) diff --git a/lfs/stunnel b/lfs/stunnel index 4585151a8..684e4522d 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/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 From 7f328d35400a8612a96eeacc6756187255f329d8 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Sat, 25 Feb 2017 15:46:58 +0100 Subject: [PATCH 35/63] amavisd: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/amavisd | 4 ++++ src/initscripts/{init.d => packages}/amavisd | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/amavisd (100%) diff --git a/lfs/amavisd b/lfs/amavisd index 39464e4e6..7230c0c0e 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/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 From 2e57eb171395c80658249a476b69a8a4ad21b2e1 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Sat, 25 Feb 2017 15:49:07 +0100 Subject: [PATCH 36/63] client175: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/client175 | 4 ++++ src/initscripts/{init.d => packages}/client175 | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/client175 (100%) diff --git a/lfs/client175 b/lfs/client175 index ef2b487fb..cc462d0aa 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/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 From 06c99e6d4d6e65dea00ea94585a30c08635b29d0 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Sat, 25 Feb 2017 15:54:55 +0100 Subject: [PATCH 37/63] postfix: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/postfix | 4 ++++ src/initscripts/{init.d => packages}/postfix | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/postfix (100%) diff --git a/lfs/postfix b/lfs/postfix index b8029f763..3758b9cbe 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/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 From 76589562ea8921d8d5b5f009f568c67a5be41e7c Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 1 Mar 2017 13:04:36 +0100 Subject: [PATCH 38/63] tftpd: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/tftpd | 2 ++ src/initscripts/{init.d => packages}/tftpd | 0 2 files changed, 2 insertions(+) rename src/initscripts/{init.d => packages}/tftpd (100%) diff --git a/lfs/tftpd b/lfs/tftpd index 2ebf84a95..e0cd93bda 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/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 From ff0f73305cc7ae85cc18b1e3500285c47597bb23 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 1 Mar 2017 13:05:55 +0100 Subject: [PATCH 39/63] rtpproxy: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/rtpproxy | 2 ++ src/initscripts/{init.d => packages}/rtpproxy | 0 2 files changed, 2 insertions(+) rename src/initscripts/{init.d => packages}/rtpproxy (100%) diff --git a/lfs/rtpproxy b/lfs/rtpproxy index 88715dd78..be276c6dc 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/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 From 746b72fea87b21ac18730adb20b8d2cf0500a9d8 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 1 Mar 2017 13:06:52 +0100 Subject: [PATCH 40/63] fetchmail: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/fetchmail | 4 ++++ src/initscripts/{init.d => packages}/fetchmail | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/fetchmail (100%) diff --git a/lfs/fetchmail b/lfs/fetchmail index 66b9a65b0..ab271b002 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/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 From 8bcca7ca0a042e94e030f03492becd0026afad02 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 1 Mar 2017 13:08:43 +0100 Subject: [PATCH 41/63] lcr: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/lcr | 3 +++ src/initscripts/{init.d => packages}/lcr | 0 2 files changed, 3 insertions(+) rename src/initscripts/{init.d => packages}/lcr (100%) diff --git a/lfs/lcr b/lfs/lcr index 321be97ed..7ada81ddb 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/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 From 89760da44254a7eb74ab0cee02c93763a036e50f Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 1 Mar 2017 13:10:24 +0100 Subject: [PATCH 42/63] spamassassin: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/spamassassin | 4 ++++ src/initscripts/{init.d => packages}/spamassassin | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/spamassassin (100%) diff --git a/lfs/spamassassin b/lfs/spamassassin index 02d60fe05..75944a78c 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/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 From 896209f6f147d6213fe790c2e6e538440fa66612 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 1 Mar 2017 13:11:59 +0100 Subject: [PATCH 43/63] mpd: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/mpd | 4 ++++ src/initscripts/{init.d => packages}/mpd | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/mpd (100%) diff --git a/lfs/mpd b/lfs/mpd index 7b2c54d0a..681b5c994 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/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 From 7d9b033b79af8124853a0aac6992389ea8595172 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Wed, 1 Mar 2017 13:13:36 +0100 Subject: [PATCH 44/63] sslh: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/sslh | 4 ++++ src/initscripts/{init.d => packages}/sslh | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/sslh (100%) diff --git a/lfs/sslh b/lfs/sslh index f4201c335..8262a5fc6 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/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 From f09be2a5350b53ec191dcdebe4c105e7835022e5 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 14:57:55 +0100 Subject: [PATCH 45/63] vdr: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/vdr | 3 +++ src/initscripts/{init.d => packages}/vdr | 0 2 files changed, 3 insertions(+) rename src/initscripts/{init.d => packages}/vdr (100%) diff --git a/lfs/vdr b/lfs/vdr index 52ecdd543..99e81048a 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/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 From da6608ef68b8f7beee31a3d957c3e986d4d54a26 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 14:58:49 +0100 Subject: [PATCH 46/63] vdradmin: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/vdradmin | 4 ++++ src/initscripts/{init.d => packages}/vdradmin | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/vdradmin (100%) diff --git a/lfs/vdradmin b/lfs/vdradmin index b38ecca4d..bca5c5835 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/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 From 112fb61b69f58f23b978cdd2982a57644e8e79dd Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 14:59:58 +0100 Subject: [PATCH 47/63] lcdproc: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/lcdproc | 4 ++++ src/initscripts/{init.d => packages}/lcdproc | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/lcdproc (100%) diff --git a/lfs/lcdproc b/lfs/lcdproc index 83b24376c..e408294dc 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/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 From 41e5aa4a8809a199dd120cb913270b561bce6a94 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 15:06:55 +0100 Subject: [PATCH 48/63] dbus: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/dbus | 4 ++++ src/initscripts/{init.d => packages}/messagebus | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/messagebus (100%) diff --git a/lfs/dbus b/lfs/dbus index 3a431066a..fdbad474b 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/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 From e5379b19813b57c337b00ac0c37c48ad606854d5 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 15:10:22 +0100 Subject: [PATCH 49/63] netsnmpd: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/netsnmpd | 5 ++++- src/initscripts/{init.d => packages}/netsnmpd | 0 2 files changed, 4 insertions(+), 1 deletion(-) rename src/initscripts/{init.d => packages}/netsnmpd (100%) diff --git a/lfs/netsnmpd b/lfs/netsnmpd index b51367855..1e59457bd 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/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 From 9f312b3dde6578c6a3710694ec2e1df3ae677a9a Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 15:12:38 +0100 Subject: [PATCH 50/63] lcd4linux: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/lcd4linux | 4 ++++ src/initscripts/{init.d => packages}/lcd4linux | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/lcd4linux (100%) diff --git a/lfs/lcd4linux b/lfs/lcd4linux index a736381fe..31bcf12e6 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/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 From 4fa43dd1009a24083db4c8e075ba09d115530c3f Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 15:15:47 +0100 Subject: [PATCH 51/63] vsftpd: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/vsftpd | 4 ++++ src/initscripts/{init.d => packages}/vsftpd | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/vsftpd (100%) diff --git a/lfs/vsftpd b/lfs/vsftpd index 7284be961..07dda3098 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/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 From da5c2f96303d544989f39dda6561964578a41034 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 15:18:42 +0100 Subject: [PATCH 52/63] gnump3d: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/gnump3d | 4 ++++ src/initscripts/{init.d => packages}/gnump3d | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/gnump3d (100%) diff --git a/lfs/gnump3d b/lfs/gnump3d index ca14c27e9..0022b4e6d 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/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 From dd1884ddb309b2bdee985f0805ab893bac1e45bd Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 15:35:54 +0100 Subject: [PATCH 53/63] imspector: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/imspector | 3 +++ src/initscripts/{init.d => packages}/imspector | 0 2 files changed, 3 insertions(+) rename src/initscripts/{init.d => packages}/imspector (100%) diff --git a/lfs/imspector b/lfs/imspector index 5cea87279..d4aa9b1e0 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/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 From de63e05b49ae04b883e1c5b6d628cd9fba923408 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 16:31:51 +0100 Subject: [PATCH 54/63] mediatomb: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/mediatomb | 4 ++++ src/initscripts/{init.d => packages}/mediatomb | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/mediatomb (100%) diff --git a/lfs/mediatomb b/lfs/mediatomb index 5811a0ad6..c36710a27 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/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 From 586761dd73fa21f39b22f0cb8b5d1112cfb7ce64 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 16:32:53 +0100 Subject: [PATCH 55/63] monit: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/monit | 3 +++ src/initscripts/{init.d => packages}/monit | 0 2 files changed, 3 insertions(+) rename src/initscripts/{init.d => packages}/monit (100%) diff --git a/lfs/monit b/lfs/monit index 2735e15fb..cfa9699a8 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/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 From a5754e5da1830180d488306b10d3688babd6a4b8 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 16:34:09 +0100 Subject: [PATCH 56/63] cyrus-imapd: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/cyrus-imapd | 4 ++++ src/initscripts/{init.d => packages}/cyrus-imapd | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/cyrus-imapd (100%) diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd index f4c855c76..e6452aef9 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/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 From 7e8a2556e55f3023e257348dae447321c0034870 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 16:35:36 +0100 Subject: [PATCH 57/63] miau: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/miau | 4 ++++ src/initscripts/{init.d => packages}/miau | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/miau (100%) diff --git a/lfs/miau b/lfs/miau index c3ca754be..8106587db 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/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 From 9016d19e0e22c14974f2283c5661f9c2fe17ab6c Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 16:36:36 +0100 Subject: [PATCH 58/63] minidlna: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/minidlna | 4 ++++ src/initscripts/{init.d => packages}/minidlna | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/minidlna (100%) diff --git a/lfs/minidlna b/lfs/minidlna index 1c3f61c42..3302cdd5c 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/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 From bd2a7a8fd3ab37d3d2f28a56494e147005902ead Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 16:37:41 +0100 Subject: [PATCH 59/63] miniupnpd: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/miniupnpd | 3 +++ src/initscripts/{init.d => packages}/miniupnpd | 0 2 files changed, 3 insertions(+) rename src/initscripts/{init.d => packages}/miniupnpd (100%) diff --git a/lfs/miniupnpd b/lfs/miniupnpd index 18b8c393b..0e2c890ba 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/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 From edda4a223bba278c24ac093baed89249d0b30083 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 16:45:44 +0100 Subject: [PATCH 60/63] cyrus-sasl: move initscript to src/initscripts/packages and use new macro Signed-off-by: Jonatan Schlag --- lfs/cyrus-sasl | 4 ++++ src/initscripts/{init.d => packages}/cyrus-sasl | 0 2 files changed, 4 insertions(+) rename src/initscripts/{init.d => packages}/cyrus-sasl (100%) diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl index 84f49d935..757f7426b 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/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 From 530188483521ffe055141c635530cf4e80955374 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Fri, 3 Mar 2017 16:46:35 +0100 Subject: [PATCH 61/63] Remove unused applejuice script Signed-off-by: Jonatan Schlag --- src/initscripts/init.d/applejuice | 53 ------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 src/initscripts/init.d/applejuice diff --git a/src/initscripts/init.d/applejuice b/src/initscripts/init.d/applejuice deleted file mode 100644 index d8bbc8c50..000000000 --- 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 From 713151aaa8a4d3af467081912bca7991db4d5af6 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Mon, 6 Mar 2017 17:25:10 +0100 Subject: [PATCH 62/63] 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 --- lfs/strongswan | 2 -- 1 file changed, 2 deletions(-) diff --git a/lfs/strongswan b/lfs/strongswan index 9e8f155e6..0af9e9dbe 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 From ad898e7f46ef659a639ea23768ffd394057a7064 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Mon, 6 Mar 2017 17:31:10 +0100 Subject: [PATCH 63/63] 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 --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index f5e792a9a..24ea77711 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