public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7c30831ad2aee45b9ccc8d9156bf7d6069f61a6a
Date: Sun, 11 Aug 2019 10:12:29 +0100	[thread overview]
Message-ID: <20190811091230.639CE60ABE@people01.haj.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 21024 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  7c30831ad2aee45b9ccc8d9156bf7d6069f61a6a (commit)
       via  85dfdf5d256665ede608f2f5885afc5e70615667 (commit)
      from  be60bc8914126fbcbab34cbf3826d2d5c821bfeb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7c30831ad2aee45b9ccc8d9156bf7d6069f61a6a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Aug 11 11:09:40 2019 +0200

    initskripts: move unbound down after network down
    
    this remove a bunch of unbound errors at shutdown because
    network down try to reconfigure unbond. (e.g. disable forwarders)
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 85dfdf5d256665ede608f2f5885afc5e70615667
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Aug 11 10:54:14 2019 +0200

    start core136
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/aarch64/initscripts        |  4 +--
 config/rootfiles/common/armv5tel/initscripts       |  4 +--
 config/rootfiles/common/i586/initscripts           |  4 +--
 config/rootfiles/common/x86_64/initscripts         |  4 +--
 config/rootfiles/core/{135 => 136}/exclude         |  0
 .../{oldcore/113 => core/136}/filelists/files      |  3 +-
 .../rootfiles/{oldcore/129 => core/136}/update.sh  | 32 ++++++++++++----------
 config/rootfiles/{core => oldcore}/135/exclude     |  0
 .../{core => oldcore}/135/filelists/aarch64/linux  |  0
 .../135/filelists/aarch64/linux-initrd             |  0
 .../{core => oldcore}/135/filelists/aarch64/u-boot |  0
 .../135/filelists/armv5tel/linux-initrd-kirkwood   |  0
 .../135/filelists/armv5tel/linux-initrd-multi      |  0
 .../135/filelists/armv5tel/linux-kirkwood          |  0
 .../135/filelists/armv5tel/linux-multi             |  0
 .../135/filelists/armv5tel/u-boot                  |  0
 .../135/filelists/armv5tel/u-boot-friendlyarm      |  0
 .../rootfiles/{core => oldcore}/135/filelists/ddns |  0
 .../{core => oldcore}/135/filelists/dhcpcd         |  0
 .../{core => oldcore}/135/filelists/files          |  0
 .../{core => oldcore}/135/filelists/i586/linux     |  0
 .../135/filelists/i586/linux-initrd                |  0
 .../{core => oldcore}/135/filelists/nettle         |  0
 .../{core => oldcore}/135/filelists/squid          |  0
 .../{core => oldcore}/135/filelists/tzdata         |  0
 .../{core => oldcore}/135/filelists/x86_64/linux   |  0
 .../135/filelists/x86_64/linux-initrd              |  0
 .../135/filelists/x86_64/sysctl-x86_64             |  0
 config/rootfiles/{core => oldcore}/135/update.sh   |  0
 lfs/initscripts                                    |  4 +--
 make.sh                                            |  2 +-
 31 files changed, 29 insertions(+), 28 deletions(-)
 copy config/rootfiles/core/{135 => 136}/exclude (100%)
 copy config/rootfiles/{oldcore/113 => core/136}/filelists/files (51%)
 copy config/rootfiles/{oldcore/129 => core/136}/update.sh (84%)
 rename config/rootfiles/{core => oldcore}/135/exclude (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/aarch64/linux (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/aarch64/linux-initrd (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/aarch64/u-boot (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/armv5tel/linux-initrd-kirkwood (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/armv5tel/linux-initrd-multi (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/armv5tel/linux-kirkwood (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/armv5tel/linux-multi (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/armv5tel/u-boot (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/armv5tel/u-boot-friendlyarm (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/ddns (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/dhcpcd (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/files (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/i586/linux (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/i586/linux-initrd (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/nettle (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/squid (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/tzdata (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/x86_64/linux (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/x86_64/linux-initrd (100%)
 rename config/rootfiles/{core => oldcore}/135/filelists/x86_64/sysctl-x86_64 (100%)
 rename config/rootfiles/{core => oldcore}/135/update.sh (100%)

Difference in files:
diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index 260a961fe..8a025c3bf 100644
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -109,11 +109,11 @@ etc/rc.d/rc0.d/K51vnstat
 etc/rc.d/rc0.d/K77conntrackd
 etc/rc.d/rc0.d/K78suricata
 etc/rc.d/rc0.d/K79leds
-etc/rc.d/rc0.d/K79unbound
 etc/rc.d/rc0.d/K80network
 etc/rc.d/rc0.d/K82wlanclient
 #etc/rc.d/rc0.d/K84bluetooth
 #etc/rc.d/rc0.d/K85messagebus
+etc/rc.d/rc0.d/K86unbound
 etc/rc.d/rc0.d/K87acpid
 etc/rc.d/rc0.d/K90sysklogd
 etc/rc.d/rc0.d/S60sendsignals
@@ -162,11 +162,11 @@ etc/rc.d/rc6.d/K51vnstat
 etc/rc.d/rc6.d/K77conntrackd
 etc/rc.d/rc6.d/K78suricata
 etc/rc.d/rc6.d/K79leds
-etc/rc.d/rc6.d/K79unbound
 etc/rc.d/rc6.d/K80network
 etc/rc.d/rc6.d/K82wlanclient
 #etc/rc.d/rc6.d/K84bluetooth
 #etc/rc.d/rc6.d/K85messagebus
+etc/rc.d/rc6.d/K86unbound
 etc/rc.d/rc6.d/K87acpid
 etc/rc.d/rc6.d/K90sysklogd
 etc/rc.d/rc6.d/S60sendsignals
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 260a961fe..8a025c3bf 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -109,11 +109,11 @@ etc/rc.d/rc0.d/K51vnstat
 etc/rc.d/rc0.d/K77conntrackd
 etc/rc.d/rc0.d/K78suricata
 etc/rc.d/rc0.d/K79leds
-etc/rc.d/rc0.d/K79unbound
 etc/rc.d/rc0.d/K80network
 etc/rc.d/rc0.d/K82wlanclient
 #etc/rc.d/rc0.d/K84bluetooth
 #etc/rc.d/rc0.d/K85messagebus
+etc/rc.d/rc0.d/K86unbound
 etc/rc.d/rc0.d/K87acpid
 etc/rc.d/rc0.d/K90sysklogd
 etc/rc.d/rc0.d/S60sendsignals
@@ -162,11 +162,11 @@ etc/rc.d/rc6.d/K51vnstat
 etc/rc.d/rc6.d/K77conntrackd
 etc/rc.d/rc6.d/K78suricata
 etc/rc.d/rc6.d/K79leds
-etc/rc.d/rc6.d/K79unbound
 etc/rc.d/rc6.d/K80network
 etc/rc.d/rc6.d/K82wlanclient
 #etc/rc.d/rc6.d/K84bluetooth
 #etc/rc.d/rc6.d/K85messagebus
+etc/rc.d/rc6.d/K86unbound
 etc/rc.d/rc6.d/K87acpid
 etc/rc.d/rc6.d/K90sysklogd
 etc/rc.d/rc6.d/S60sendsignals
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index d74fb743b..4349cd618 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -108,11 +108,11 @@ etc/rc.d/rc0.d/K51vnstat
 etc/rc.d/rc0.d/K77conntrackd
 etc/rc.d/rc0.d/K78suricata
 etc/rc.d/rc0.d/K79leds
-etc/rc.d/rc0.d/K79unbound
 etc/rc.d/rc0.d/K80network
 etc/rc.d/rc0.d/K82wlanclient
 #etc/rc.d/rc0.d/K84bluetooth
 #etc/rc.d/rc0.d/K85messagebus
+etc/rc.d/rc0.d/K86unbound
 etc/rc.d/rc0.d/K87acpid
 etc/rc.d/rc0.d/K90sysklogd
 etc/rc.d/rc0.d/S60sendsignals
@@ -161,11 +161,11 @@ etc/rc.d/rc6.d/K51vnstat
 etc/rc.d/rc6.d/K77conntrackd
 etc/rc.d/rc6.d/K78suricata
 etc/rc.d/rc6.d/K79leds
-etc/rc.d/rc6.d/K79unbound
 etc/rc.d/rc6.d/K80network
 etc/rc.d/rc6.d/K82wlanclient
 #etc/rc.d/rc6.d/K84bluetooth
 #etc/rc.d/rc6.d/K85messagebus
+etc/rc.d/rc6.d/K86unbound
 etc/rc.d/rc6.d/K87acpid
 etc/rc.d/rc6.d/K90sysklogd
 etc/rc.d/rc6.d/S60sendsignals
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index d74fb743b..4349cd618 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -108,11 +108,11 @@ etc/rc.d/rc0.d/K51vnstat
 etc/rc.d/rc0.d/K77conntrackd
 etc/rc.d/rc0.d/K78suricata
 etc/rc.d/rc0.d/K79leds
-etc/rc.d/rc0.d/K79unbound
 etc/rc.d/rc0.d/K80network
 etc/rc.d/rc0.d/K82wlanclient
 #etc/rc.d/rc0.d/K84bluetooth
 #etc/rc.d/rc0.d/K85messagebus
+etc/rc.d/rc0.d/K86unbound
 etc/rc.d/rc0.d/K87acpid
 etc/rc.d/rc0.d/K90sysklogd
 etc/rc.d/rc0.d/S60sendsignals
@@ -161,11 +161,11 @@ etc/rc.d/rc6.d/K51vnstat
 etc/rc.d/rc6.d/K77conntrackd
 etc/rc.d/rc6.d/K78suricata
 etc/rc.d/rc6.d/K79leds
-etc/rc.d/rc6.d/K79unbound
 etc/rc.d/rc6.d/K80network
 etc/rc.d/rc6.d/K82wlanclient
 #etc/rc.d/rc6.d/K84bluetooth
 #etc/rc.d/rc6.d/K85messagebus
+etc/rc.d/rc6.d/K86unbound
 etc/rc.d/rc6.d/K87acpid
 etc/rc.d/rc6.d/K90sysklogd
 etc/rc.d/rc6.d/S60sendsignals
diff --git a/config/rootfiles/core/135/exclude b/config/rootfiles/core/136/exclude
similarity index 100%
rename from config/rootfiles/core/135/exclude
rename to config/rootfiles/core/136/exclude
diff --git a/config/rootfiles/core/136/filelists/files b/config/rootfiles/core/136/filelists/files
new file mode 100644
index 000000000..ce4e51768
--- /dev/null
+++ b/config/rootfiles/core/136/filelists/files
@@ -0,0 +1,4 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
diff --git a/config/rootfiles/core/136/update.sh b/config/rootfiles/core/136/update.sh
new file mode 100644
index 000000000..7dcf87b62
--- /dev/null
+++ b/config/rootfiles/core/136/update.sh
@@ -0,0 +1,79 @@
+#!/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 3 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) 2019 IPFire-Team <info(a)ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=136
+
+exit_with_error() {
+	# Set last succesfull installed core.
+	echo $(($core-1)) > /opt/pakfire/db/core/mine
+	# don't start pakfire again at error
+	killall -KILL pak_update
+	/usr/bin/logger -p syslog.emerg -t ipfire \
+		"core-update-${core}: $1"
+	exit $2
+}
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+
+# Remove files
+
+# Stop services
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# move unbound down after network down
+mv /etc/rc.d/rc0.d/K79unbound /etc/rc.d/rc0.d/K86unbound
+mv /etc/rc.d/rc6.d/K79unbound /etc/rc.d/rc6.d/K86unbound
+
+# Start services
+
+# This update needs a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+	grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/135/exclude b/config/rootfiles/oldcore/135/exclude
new file mode 100644
index 000000000..b22159878
--- /dev/null
+++ b/config/rootfiles/oldcore/135/exclude
@@ -0,0 +1,28 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/135/filelists/aarch64/linux b/config/rootfiles/oldcore/135/filelists/aarch64/linux
similarity index 100%
rename from config/rootfiles/core/135/filelists/aarch64/linux
rename to config/rootfiles/oldcore/135/filelists/aarch64/linux
diff --git a/config/rootfiles/core/135/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/135/filelists/aarch64/linux-initrd
similarity index 100%
rename from config/rootfiles/core/135/filelists/aarch64/linux-initrd
rename to config/rootfiles/oldcore/135/filelists/aarch64/linux-initrd
diff --git a/config/rootfiles/core/135/filelists/aarch64/u-boot b/config/rootfiles/oldcore/135/filelists/aarch64/u-boot
similarity index 100%
rename from config/rootfiles/core/135/filelists/aarch64/u-boot
rename to config/rootfiles/oldcore/135/filelists/aarch64/u-boot
diff --git a/config/rootfiles/core/135/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/oldcore/135/filelists/armv5tel/linux-initrd-kirkwood
similarity index 100%
rename from config/rootfiles/core/135/filelists/armv5tel/linux-initrd-kirkwood
rename to config/rootfiles/oldcore/135/filelists/armv5tel/linux-initrd-kirkwood
diff --git a/config/rootfiles/core/135/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/oldcore/135/filelists/armv5tel/linux-initrd-multi
similarity index 100%
rename from config/rootfiles/core/135/filelists/armv5tel/linux-initrd-multi
rename to config/rootfiles/oldcore/135/filelists/armv5tel/linux-initrd-multi
diff --git a/config/rootfiles/core/135/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/135/filelists/armv5tel/linux-kirkwood
similarity index 100%
rename from config/rootfiles/core/135/filelists/armv5tel/linux-kirkwood
rename to config/rootfiles/oldcore/135/filelists/armv5tel/linux-kirkwood
diff --git a/config/rootfiles/core/135/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/135/filelists/armv5tel/linux-multi
similarity index 100%
rename from config/rootfiles/core/135/filelists/armv5tel/linux-multi
rename to config/rootfiles/oldcore/135/filelists/armv5tel/linux-multi
diff --git a/config/rootfiles/core/135/filelists/armv5tel/u-boot b/config/rootfiles/oldcore/135/filelists/armv5tel/u-boot
similarity index 100%
rename from config/rootfiles/core/135/filelists/armv5tel/u-boot
rename to config/rootfiles/oldcore/135/filelists/armv5tel/u-boot
diff --git a/config/rootfiles/core/135/filelists/armv5tel/u-boot-friendlyarm b/config/rootfiles/oldcore/135/filelists/armv5tel/u-boot-friendlyarm
similarity index 100%
rename from config/rootfiles/core/135/filelists/armv5tel/u-boot-friendlyarm
rename to config/rootfiles/oldcore/135/filelists/armv5tel/u-boot-friendlyarm
diff --git a/config/rootfiles/core/135/filelists/ddns b/config/rootfiles/oldcore/135/filelists/ddns
similarity index 100%
rename from config/rootfiles/core/135/filelists/ddns
rename to config/rootfiles/oldcore/135/filelists/ddns
diff --git a/config/rootfiles/core/135/filelists/dhcpcd b/config/rootfiles/oldcore/135/filelists/dhcpcd
similarity index 100%
rename from config/rootfiles/core/135/filelists/dhcpcd
rename to config/rootfiles/oldcore/135/filelists/dhcpcd
diff --git a/config/rootfiles/core/135/filelists/files b/config/rootfiles/oldcore/135/filelists/files
similarity index 100%
rename from config/rootfiles/core/135/filelists/files
rename to config/rootfiles/oldcore/135/filelists/files
diff --git a/config/rootfiles/core/135/filelists/i586/linux b/config/rootfiles/oldcore/135/filelists/i586/linux
similarity index 100%
rename from config/rootfiles/core/135/filelists/i586/linux
rename to config/rootfiles/oldcore/135/filelists/i586/linux
diff --git a/config/rootfiles/core/135/filelists/i586/linux-initrd b/config/rootfiles/oldcore/135/filelists/i586/linux-initrd
similarity index 100%
rename from config/rootfiles/core/135/filelists/i586/linux-initrd
rename to config/rootfiles/oldcore/135/filelists/i586/linux-initrd
diff --git a/config/rootfiles/core/135/filelists/nettle b/config/rootfiles/oldcore/135/filelists/nettle
similarity index 100%
rename from config/rootfiles/core/135/filelists/nettle
rename to config/rootfiles/oldcore/135/filelists/nettle
diff --git a/config/rootfiles/core/135/filelists/squid b/config/rootfiles/oldcore/135/filelists/squid
similarity index 100%
rename from config/rootfiles/core/135/filelists/squid
rename to config/rootfiles/oldcore/135/filelists/squid
diff --git a/config/rootfiles/core/135/filelists/tzdata b/config/rootfiles/oldcore/135/filelists/tzdata
similarity index 100%
rename from config/rootfiles/core/135/filelists/tzdata
rename to config/rootfiles/oldcore/135/filelists/tzdata
diff --git a/config/rootfiles/core/135/filelists/x86_64/linux b/config/rootfiles/oldcore/135/filelists/x86_64/linux
similarity index 100%
rename from config/rootfiles/core/135/filelists/x86_64/linux
rename to config/rootfiles/oldcore/135/filelists/x86_64/linux
diff --git a/config/rootfiles/core/135/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/135/filelists/x86_64/linux-initrd
similarity index 100%
rename from config/rootfiles/core/135/filelists/x86_64/linux-initrd
rename to config/rootfiles/oldcore/135/filelists/x86_64/linux-initrd
diff --git a/config/rootfiles/core/135/filelists/x86_64/sysctl-x86_64 b/config/rootfiles/oldcore/135/filelists/x86_64/sysctl-x86_64
similarity index 100%
rename from config/rootfiles/core/135/filelists/x86_64/sysctl-x86_64
rename to config/rootfiles/oldcore/135/filelists/x86_64/sysctl-x86_64
diff --git a/config/rootfiles/core/135/update.sh b/config/rootfiles/oldcore/135/update.sh
similarity index 100%
rename from config/rootfiles/core/135/update.sh
rename to config/rootfiles/oldcore/135/update.sh
diff --git a/lfs/initscripts b/lfs/initscripts
index 68cab0ba2..d74e0c650 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -126,9 +126,9 @@ $(TARGET) :
 	ln -sf ../init.d/network     /etc/rc.d/rc0.d/K80network
 	ln -sf ../init.d/network     /etc/rc.d/rc3.d/S20network
 	ln -sf ../init.d/network     /etc/rc.d/rc6.d/K80network
-	ln -sf ../init.d/unbound     /etc/rc.d/rc0.d/K79unbound
+	ln -sf ../init.d/unbound     /etc/rc.d/rc0.d/K86unbound
 	ln -sf ../init.d/unbound     /etc/rc.d/rc3.d/S11unbound
-	ln -sf ../init.d/unbound     /etc/rc.d/rc6.d/K79unbound
+	ln -sf ../init.d/unbound     /etc/rc.d/rc6.d/K86unbound
 	ln -sf ../init.d/random      /etc/rc.d/rc0.d/K45random
 	ln -sf ../init.d/random      /etc/rc.d/rc3.d/S00random
 	ln -sf ../init.d/random      /etc/rc.d/rc6.d/K45random
diff --git a/make.sh b/make.sh
index 9d5e561bc..bf0f3a19e 100755
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.23"							# Version number
-CORE="135"							# Core Level (Filename)
+CORE="136"							# Core Level (Filename)
 PAKFIRE_CORE="135"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan


hooks/post-receive
--
IPFire 2.x development tree

                 reply	other threads:[~2019-08-11  9:12 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190811091230.639CE60ABE@people01.haj.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox