Merge branch 'initscripts-cleanup' of git://git.ipfire.org/people/jschlag/ipfire-2.x into next

This commit is contained in:
Michael Tremer
2017-03-09 11:04:52 +00:00
194 changed files with 192 additions and 241 deletions

View File

@@ -3,65 +3,30 @@ etc/init.d
#etc/rc.d/helper
etc/rc.d/helper/getdnsfromdhcpc.pl
#etc/rc.d/init.d
#etc/rc.d/init.d/alsa
#etc/rc.d/init.d/amavisd
etc/rc.d/init.d/apache
#etc/rc.d/init.d/apcupsd
#etc/rc.d/init.d/applejuice
#etc/rc.d/init.d/asterisk
etc/rc.d/init.d/beep
#etc/rc.d/init.d/bluetooth
etc/rc.d/init.d/checkfs
#etc/rc.d/init.d/clamav
etc/rc.d/init.d/cleanfs
#etc/rc.d/init.d/client175
etc/rc.d/init.d/collectd
etc/rc.d/init.d/connectd
etc/rc.d/init.d/console
#etc/rc.d/init.d/cpufreq
#etc/rc.d/init.d/cups
#etc/rc.d/init.d/cyrus-imapd
#etc/rc.d/init.d/cyrus-sasl
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
#etc/rc.d/init.d/dnsdist
etc/rc.d/init.d/fcron
#etc/rc.d/init.d/fetchmail
etc/rc.d/init.d/fireinfo
etc/rc.d/init.d/firewall
etc/rc.d/init.d/firstsetup
#etc/rc.d/init.d/freeradius
etc/rc.d/init.d/fsresize
etc/rc.d/init.d/functions
#etc/rc.d/init.d/gnump3d
#etc/rc.d/init.d/guardian
etc/rc.d/init.d/halt
#etc/rc.d/init.d/haproxy
#etc/rc.d/init.d/hostapd
#etc/rc.d/init.d/imspector
etc/rc.d/init.d/ipsec
#etc/rc.d/init.d/keepalived
#etc/rc.d/init.d/lcd4linux
#etc/rc.d/init.d/lcdproc
#etc/rc.d/init.d/lcr
etc/rc.d/init.d/leds
#etc/rc.d/init.d/libvirtd
etc/rc.d/init.d/localnet
etc/rc.d/init.d/mISDN
#etc/rc.d/init.d/mediatomb
#etc/rc.d/init.d/messagebus
#etc/rc.d/init.d/miau
#etc/rc.d/init.d/minidlna
#etc/rc.d/init.d/miniupnpd
etc/rc.d/init.d/modules
#etc/rc.d/init.d/monit
#etc/rc.d/init.d/motion
etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
#etc/rc.d/init.d/mpd
#etc/rc.d/init.d/mysql
#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-trigger
#etc/rc.d/init.d/networking
@@ -98,52 +63,31 @@ etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-geoip-database
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe
#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
#etc/rc.d/init.d/nut
#etc/rc.d/init.d/openvmtools
etc/rc.d/init.d/partresize
#etc/rc.d/init.d/postfix
#etc/rc.d/init.d/pound
etc/rc.d/init.d/random
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
#etc/rc.d/init.d/rpcbind
#etc/rc.d/init.d/rtpproxy
#etc/rc.d/init.d/samba
#etc/rc.d/init.d/sane
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
etc/rc.d/init.d/snort
#etc/rc.d/init.d/spamassassin
etc/rc.d/init.d/squid
etc/rc.d/init.d/sshd
#etc/rc.d/init.d/sslh
etc/rc.d/init.d/static-routes
#etc/rc.d/init.d/stunnel
etc/rc.d/init.d/swap
etc/rc.d/init.d/swconfig
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd
etc/rc.d/init.d/template
#etc/rc.d/init.d/tftpd
#etc/rc.d/init.d/tor
#etc/rc.d/init.d/transmission
etc/rc.d/init.d/udev
etc/rc.d/init.d/udev_retry
etc/rc.d/init.d/unbound
etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vdr
#etc/rc.d/init.d/vdradmin
#etc/rc.d/init.d/virtlogd
etc/rc.d/init.d/vnstat
#etc/rc.d/init.d/vsftpd
etc/rc.d/init.d/waitdrives
#etc/rc.d/init.d/watchdog
etc/rc.d/init.d/wlanclient
#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion

View File

@@ -4,66 +4,30 @@ etc/init.d
etc/rc.d/helper/getdnsfromdhcpc.pl
#etc/rc.d/init.d
etc/rc.d/init.d/acpid
#etc/rc.d/init.d/alsa
#etc/rc.d/init.d/amavisd
etc/rc.d/init.d/apache
#etc/rc.d/init.d/apcupsd
#etc/rc.d/init.d/applejuice
#etc/rc.d/init.d/asterisk
etc/rc.d/init.d/beep
#etc/rc.d/init.d/bluetooth
etc/rc.d/init.d/checkfs
#etc/rc.d/init.d/clamav
etc/rc.d/init.d/cleanfs
#etc/rc.d/init.d/client175
etc/rc.d/init.d/collectd
etc/rc.d/init.d/connectd
etc/rc.d/init.d/console
#etc/rc.d/init.d/cpufreq
#etc/rc.d/init.d/cups
#etc/rc.d/init.d/cyrus-imapd
#etc/rc.d/init.d/cyrus-sasl
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
#etc/rc.d/init.d/dnsdist
etc/rc.d/init.d/fcron
#etc/rc.d/init.d/fetchmail
etc/rc.d/init.d/fireinfo
etc/rc.d/init.d/firewall
etc/rc.d/init.d/firstsetup
#etc/rc.d/init.d/freeradius
etc/rc.d/init.d/fsresize
etc/rc.d/init.d/functions
#etc/rc.d/init.d/gnump3d
#etc/rc.d/init.d/guardian
etc/rc.d/init.d/halt
#etc/rc.d/init.d/haproxy
#etc/rc.d/init.d/hostapd
#etc/rc.d/init.d/imspector
etc/rc.d/init.d/ipsec
#etc/rc.d/init.d/keepalived
#etc/rc.d/init.d/lcd4linux
#etc/rc.d/init.d/lcdproc
#etc/rc.d/init.d/lcr
etc/rc.d/init.d/leds
#etc/rc.d/init.d/libvirt-guests
#etc/rc.d/init.d/libvirtd
etc/rc.d/init.d/localnet
etc/rc.d/init.d/mISDN
#etc/rc.d/init.d/mediatomb
#etc/rc.d/init.d/messagebus
#etc/rc.d/init.d/miau
#etc/rc.d/init.d/minidlna
#etc/rc.d/init.d/miniupnpd
etc/rc.d/init.d/modules
#etc/rc.d/init.d/monit
#etc/rc.d/init.d/motion
etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
#etc/rc.d/init.d/mpd
#etc/rc.d/init.d/mysql
#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-trigger
#etc/rc.d/init.d/networking
@@ -100,51 +64,30 @@ etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-geoip-database
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe
#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
#etc/rc.d/init.d/nut
#etc/rc.d/init.d/openvmtools
etc/rc.d/init.d/partresize
#etc/rc.d/init.d/postfix
#etc/rc.d/init.d/pound
etc/rc.d/init.d/random
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
#etc/rc.d/init.d/rpcbind
#etc/rc.d/init.d/rtpproxy
#etc/rc.d/init.d/samba
#etc/rc.d/init.d/sane
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
etc/rc.d/init.d/snort
#etc/rc.d/init.d/spamassassin
etc/rc.d/init.d/squid
etc/rc.d/init.d/sshd
#etc/rc.d/init.d/sslh
etc/rc.d/init.d/static-routes
#etc/rc.d/init.d/stunnel
etc/rc.d/init.d/swap
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd
etc/rc.d/init.d/template
#etc/rc.d/init.d/tftpd
#etc/rc.d/init.d/tor
#etc/rc.d/init.d/transmission
etc/rc.d/init.d/udev
etc/rc.d/init.d/udev_retry
etc/rc.d/init.d/unbound
etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vdr
#etc/rc.d/init.d/vdradmin
#etc/rc.d/init.d/virtlogd
etc/rc.d/init.d/vnstat
#etc/rc.d/init.d/vsftpd
etc/rc.d/init.d/waitdrives
#etc/rc.d/init.d/watchdog
etc/rc.d/init.d/wlanclient
#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion

View File

@@ -4,66 +4,30 @@ etc/init.d
etc/rc.d/helper/getdnsfromdhcpc.pl
#etc/rc.d/init.d
etc/rc.d/init.d/acpid
#etc/rc.d/init.d/alsa
#etc/rc.d/init.d/amavisd
etc/rc.d/init.d/apache
#etc/rc.d/init.d/apcupsd
#etc/rc.d/init.d/applejuice
#etc/rc.d/init.d/asterisk
etc/rc.d/init.d/beep
#etc/rc.d/init.d/bluetooth
etc/rc.d/init.d/checkfs
#etc/rc.d/init.d/clamav
etc/rc.d/init.d/cleanfs
#etc/rc.d/init.d/client175
etc/rc.d/init.d/collectd
etc/rc.d/init.d/connectd
etc/rc.d/init.d/console
#etc/rc.d/init.d/cpufreq
#etc/rc.d/init.d/cups
#etc/rc.d/init.d/cyrus-imapd
#etc/rc.d/init.d/cyrus-sasl
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
#etc/rc.d/init.d/dnsdist
etc/rc.d/init.d/fcron
#etc/rc.d/init.d/fetchmail
etc/rc.d/init.d/fireinfo
etc/rc.d/init.d/firewall
etc/rc.d/init.d/firstsetup
#etc/rc.d/init.d/freeradius
etc/rc.d/init.d/fsresize
etc/rc.d/init.d/functions
#etc/rc.d/init.d/gnump3d
#etc/rc.d/init.d/guardian
etc/rc.d/init.d/halt
#etc/rc.d/init.d/haproxy
#etc/rc.d/init.d/hostapd
#etc/rc.d/init.d/imspector
etc/rc.d/init.d/ipsec
#etc/rc.d/init.d/keepalived
#etc/rc.d/init.d/lcd4linux
#etc/rc.d/init.d/lcdproc
#etc/rc.d/init.d/lcr
etc/rc.d/init.d/leds
#etc/rc.d/init.d/libvirt-guests
#etc/rc.d/init.d/libvirtd
etc/rc.d/init.d/localnet
etc/rc.d/init.d/mISDN
#etc/rc.d/init.d/mediatomb
#etc/rc.d/init.d/messagebus
#etc/rc.d/init.d/miau
#etc/rc.d/init.d/minidlna
#etc/rc.d/init.d/miniupnpd
etc/rc.d/init.d/modules
#etc/rc.d/init.d/monit
#etc/rc.d/init.d/motion
etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
#etc/rc.d/init.d/mpd
#etc/rc.d/init.d/mysql
#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-trigger
#etc/rc.d/init.d/networking
@@ -100,51 +64,30 @@ etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-geoip-database
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe
#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
#etc/rc.d/init.d/nut
#etc/rc.d/init.d/openvmtools
etc/rc.d/init.d/partresize
#etc/rc.d/init.d/postfix
#etc/rc.d/init.d/pound
etc/rc.d/init.d/random
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
#etc/rc.d/init.d/rpcbind
#etc/rc.d/init.d/rtpproxy
#etc/rc.d/init.d/samba
#etc/rc.d/init.d/sane
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
etc/rc.d/init.d/snort
#etc/rc.d/init.d/spamassassin
etc/rc.d/init.d/squid
etc/rc.d/init.d/sshd
#etc/rc.d/init.d/sslh
etc/rc.d/init.d/static-routes
#etc/rc.d/init.d/stunnel
etc/rc.d/init.d/swap
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd
etc/rc.d/init.d/template
#etc/rc.d/init.d/tftpd
#etc/rc.d/init.d/tor
#etc/rc.d/init.d/transmission
etc/rc.d/init.d/udev
etc/rc.d/init.d/udev_retry
etc/rc.d/init.d/unbound
etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vdr
#etc/rc.d/init.d/vdradmin
#etc/rc.d/init.d/virtlogd
etc/rc.d/init.d/vnstat
#etc/rc.d/init.d/vsftpd
etc/rc.d/init.d/waitdrives
#etc/rc.d/init.d/watchdog
etc/rc.d/init.d/wlanclient
#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -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)

View File

@@ -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)

View File

@@ -93,7 +93,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/cups /etc/rc.d/init.d
# install initscript
$(call INSTALL_INITSCRIPT,cups)
cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/
@rm -rf $(DIR_APP)

View File

@@ -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)

View File

@@ -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 \

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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)

View File

@@ -83,6 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP)/hostapd && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP)/hostapd && make install
install -v -m 644 $(DIR_SRC)/config/backup/includes/hostapd /var/ipfire/backup/addons/includes/hostapd
# install initscript
$(call INSTALL_INITSCRIPT,hostapd)
mkdir -p /var/ipfire/wlanap
touch /var/ipfire/wlanap/settings
cp -vrf $(DIR_SRC)/config/hostapd/hostapd.conf /var/ipfire/wlanap/hostapd.conf

View File

@@ -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)

View File

@@ -64,22 +64,22 @@ $(TARGET) :
# Create default ramdisk configuration
echo "RAMDISK_MODE=0" > /etc/sysconfig/ramdisk
for i in $(DIR_SRC)/src/initscripts/init.d/*; do \
for i in $(DIR_SRC)/src/initscripts/system/*; do \
install -v -m 754 $$i /etc/rc.d/init.d/; \
done
chmod 644 /etc/rc.d/init.d/functions
for i in $(DIR_SRC)/src/initscripts/init.d/networking/*; do \
for i in $(DIR_SRC)/src/initscripts/networking/*; do \
if [ -f $$i ]; then \
install -v -m 754 $$i /etc/rc.d/init.d/networking/; \
fi; \
done
for i in $(DIR_SRC)/src/initscripts/init.d/networking/red.up/*; do \
for i in $(DIR_SRC)/src/initscripts/networking/red.up/*; do \
install -v -m 754 $$i /etc/rc.d/init.d/networking/red.up/; \
done
for i in $(DIR_SRC)/src/initscripts/init.d/networking/red.down/*; do \
for i in $(DIR_SRC)/src/initscripts/networking/red.down/*; do \
install -v -m 754 $$i /etc/rc.d/init.d/networking/red.down/; \
done

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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)

View File

@@ -89,8 +89,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--without-storage-scsi --without-storage-mpath --without-storage-disk --without-storage-rbd --without-storage-sheepdog --without-storage-gluster --without-storage-zfs
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/libvirtd /etc/rc.d/init.d/libvirtd
install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/virtlogd /etc/rc.d/init.d/virtlogd
#install initscripts
$(call INSTALL_INITSCRIPT,libvirtd)
$(call INSTALL_INITSCRIPT,virtlogd)
mv /usr/libexec/libvirt-guests.sh /etc/rc.d/init.d/libvirt-guests
# Backup
install -v -m 644 $(DIR_SRC)/config/backup/includes/libvirt /var/ipfire/backup/addons/includes/libvirt

View File

@@ -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)

View File

@@ -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

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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 \

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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

Some files were not shown because too many files have changed in this diff Show More