Merge remote-tracking branch 'origin/next' into kernel-4.14

This commit is contained in:
Arne Fitzenreiter
2018-01-15 19:08:23 +01:00
73 changed files with 449 additions and 15232 deletions

View File

@@ -0,0 +1,48 @@
#!/bin/sh
########################################################################
# Begin $rc_base/init.d/mdns-repeater
########################################################################
. /etc/sysconfig/rc
. ${rc_functions}
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
INTERFACES=
if [ -n "${GREEN_DEV}" ]; then
INTERFACES="${INTERFACES} ${GREEN_DEV}"
fi
if [ -n "${BLUE_DEV}" ]; then
INTERFACES="${INTERFACES} ${BLUE_DEV}"
fi
case "${1}" in
start)
boot_mesg "Starting Multicast DNS Repeater..."
loadproc /usr/bin/mdns-repeater ${INTERFACES}
;;
stop)
boot_mesg "Stopping Multicast DNS Repeater..."
killproc /usr/bin/mdns-repeater
;;
restart)
${0} stop
sleep 1
${0} start
;;
status)
statusproc /usr/bin/mdns-repeater
;;
*)
echo "Usage: ${0} {start|stop|restart|status}"
exit 1
;;
esac
# End $rc_base/init.d/mdns-repeater

View File

@@ -1,53 +0,0 @@
#!/bin/sh
########################################################################
# Begin $rc_base/init.d/
#
# Description : mediatomb initscript
#
# Authors : Arne Fitzenreiter
#
# Version : 01.00
#
# Notes : for www.ipfire.org - GPLv3
#
########################################################################
. /etc/sysconfig/rc
. ${rc_functions}
case "$1" in
start)
boot_mesg "Starting mediatomb uPnP Mediaserver..."
route add -net 239.0.0.0 netmask 255.0.0.0 green0
loadproc /usr/bin/mediatomb -u nobody -g nobody \
-c /var/ipfire/mediatomb/config.xml \
-l /var/log/mediatomb.log \
-e green0 $2 $3 $4 $5 $6 $7 -d
evaluate_retval
;;
stop)
boot_mesg "Stopping mediatomb uPnP Mediaserver..."
killproc /usr/bin/mediatomb
evaluate_retval
route del -net 239.0.0.0 netmask 255.0.0.0 green0
;;
restart)
${0} stop
sleep 1
${0} start
;;
status)
statusproc /usr/bin/mediatomb
;;
*)
echo "Usage: ${0} {start|stop|init|status}"
exit 1
;;
esac
# End $rc_base/init.d/

View File

@@ -60,7 +60,7 @@ depmod -a $KVER-ipfire-pae
#
# Made initramdisk
#
/usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae
/usr/bin/dracut --early-microcode --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae
if [ -e /boot/grub/grub.cfg ]; then
#

View File

@@ -22,5 +22,16 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
extract_files
restore_backup ${NAME}
# create startlinks
ln -sf ../init.d/mdns-repeater /etc/rc.d/rc0.d/K20mdns-repeater
ln -sf ../init.d/mdns-repeater /etc/rc.d/rc3.d/S99mdns-repeater
ln -sf ../init.d/mdns-repeater /etc/rc.d/rc6.d/K20mdns-repeater
# Start the service.
start_service --background ${NAME}
exit 0

View File

@@ -25,3 +25,8 @@
stop_service ${NAME}
make_backup ${NAME}
remove_files
# Remove all start links.
rm -rf /etc/rc.d/rc*.d/*mdns-repeater
exit 0

View File

@@ -22,5 +22,6 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
./uninstall.sh
./install.sh

View File

@@ -1,27 +0,0 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
./uninstall.sh
./install.sh
/etc/init.d/mediatomb start

View File

@@ -1,44 +0,0 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
extract_files
restore_backup ${NAME}
# Fix permissions.
chmod 777 /srv/web/owncloud/apps
chmod 777 /srv/web/owncloud/config
# Create data directory.
mkdir -p /var/owncloud/data
chown -R nobody:nobody /var/owncloud
# Import web interface certificates if none exist.
if [ ! -e "/etc/httpd/owncloud.crt" ] && [ ! -e "/etc/httpd/owncloud.key" ]; then
cat /etc/httpd/server.crt > /etc/httpd/owncloud.crt
cat /etc/httpd/server.key > /etc/httpd/owncloud.key
fi
/etc/init.d/apache reload
exit 0

View File

@@ -1,30 +0,0 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
make_backup ${NAME}
remove_files
/etc/init.d/apache reload
exit 0

View File

@@ -24,4 +24,4 @@
#
KVER=`uname -r | cut -d"-" -f1`
dracut --force --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire
dracut --early-microcode --force --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire