From 39e56fae7439814974ef9c4801601e5bbf962a8f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 21 Jun 2013 23:17:46 +0200 Subject: [PATCH] buildsystem: add a check for wrong "etc/init.d/..." entries. This will destroy the symlink from /etc/init.d to /etc/rc.d/init.d at unpack. --- config/rootfiles/oldcore/27/filelists/files | 4 +-- make.sh | 1 + tools/checkwronginitlinks | 27 +++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100755 tools/checkwronginitlinks diff --git a/config/rootfiles/oldcore/27/filelists/files b/config/rootfiles/oldcore/27/filelists/files index 12dcde1d26..3b65c4fee8 100644 --- a/config/rootfiles/oldcore/27/filelists/files +++ b/config/rootfiles/oldcore/27/filelists/files @@ -1,4 +1,4 @@ -etc/init.d/squid +etc/rc.d/init.d/squid etc/sysctl.conf etc/squid/errors usr/bin/squidclient @@ -32,7 +32,7 @@ srv/web/ipfire/cgi-bin/updatexlrator.cgi var/ipfire/langs lib/modules/KVER-ipfire/kernel/drivers/net/imq.ko var/ipfire/qos/bin/makeqosscripts.pl -etc/init.d/network +etc/rc.d/init.d/network bin/ntfs-3g lib/libntfs-3g.so lib/libntfs-3g.so.49 diff --git a/make.sh b/make.sh index 6be04a3faf..f3c4a58ebf 100755 --- a/make.sh +++ b/make.sh @@ -950,6 +950,7 @@ build) cd $BASEDIR tools/checknewlog.pl + tools/checkwronginitlinks cd $PWD beautify build_end diff --git a/tools/checkwronginitlinks b/tools/checkwronginitlinks new file mode 100755 index 0000000000..6f001c0fe4 --- /dev/null +++ b/tools/checkwronginitlinks @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # +# # +# This program 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. # +# # +# This program 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 this program. If not, see . # +# # +############################################################################### + +grep -r "^etc/init.d//*" ./config/rootfiles/ >/dev/null 2>&1 +if [ "${?}" == "0" ]; then + echo "Error! 'etc/init.d/...' in rootfiles files found!" + grep -r "^etc/init.d//*" ./config/rootfiles/ + echo "Change this to 'etc/rc.d/init.d/...' !" +fi -- 2.39.2