diff --git a/Shorewall-core/shorewallrc.openwrt b/Shorewall-core/shorewallrc.openwrt index 0cfd3c6f8..1f227eb62 100644 --- a/Shorewall-core/shorewallrc.openwrt +++ b/Shorewall-core/shorewallrc.openwrt @@ -18,7 +18,7 @@ AUXINITSOURCE= AUXINITFILE= SERVICEDIR= SERVICEFILE= -SYSCONFFILE=sysconfig +SYSCONFFILE=default.openwrt SYSCONFDIR=${CONFDIR}/sysconfig SPARSE= ANNOTATED= diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 9acbaa883..b334b83a1 100755 --- a/Shorewall-init/install.sh +++ b/Shorewall-init/install.sh @@ -230,8 +230,6 @@ if [ -z "$BUILD" ]; then BUILD=slackware elif [ -f /etc/arch-release ] ; then BUILD=archlinux - elif [ -f ${CONFDIR}/openwrt_release ]; then - BUILD=openwrt else BUILD=linux fi @@ -279,9 +277,6 @@ case "$HOST" in suse) echo "Installing SuSE-specific configuration..." ;; - openwrt) - echo "Installing OpenWRT-specific configuration..." - ;; linux) echo "ERROR: Shorewall-init is not supported on this system" >&2 exit 1 @@ -544,13 +539,6 @@ if [ -z "$DESTDIR" ]; then else cant_autostart fi - elif [ $HOST = openwrt -a -f ${CONFDIR}/rc.common ]; then - /etc/init.d/shorewall-inir enable - if /etc/init.d/shorewall-init enabled; then - echo "Shorrewall Init will start automatically at boot" - else - cant_autostart - fi else cant_autostart fi diff --git a/Shorewall-lite/sysconfig b/Shorewall-lite/default.openwrt similarity index 100% rename from Shorewall-lite/sysconfig rename to Shorewall-lite/default.openwrt diff --git a/Shorewall/sysconfig b/Shorewall6-lite/default.openwrt similarity index 100% rename from Shorewall/sysconfig rename to Shorewall6-lite/default.openwrt diff --git a/Shorewall6-lite/sysconfig b/Shorewall6-lite/sysconfig deleted file mode 100644 index df4440bf9..000000000 --- a/Shorewall6-lite/sysconfig +++ /dev/null @@ -1,25 +0,0 @@ -# sysV init file script configuration(/etc/sysconfdir/shorewall-lite) - -# startup option(default "-vvv") -OPTIONS= - -# change default start run level(if none empty; /etc/init.d/shorewall-lite enable) -START=50 - -# change default stop run level(if none empty; /etc/init.d/shorewall-lite enable) -STOP= - -# option to pass when shorewall start is executed -STARTOPTIONS= - -# option to pass when shorewall restart is executed -RESTARTOPTIONS= - -# option to pass when shorewall reload is executed -RELOADOPTIONS= - -# option to pass when shorewall stop is executed -STOPOPTIONS= - -# option to pass when shorewall status is executed -STATUSOPTIONS= diff --git a/Shorewall6/sysconfig b/Shorewall6/sysconfig deleted file mode 100644 index df4440bf9..000000000 --- a/Shorewall6/sysconfig +++ /dev/null @@ -1,25 +0,0 @@ -# sysV init file script configuration(/etc/sysconfdir/shorewall-lite) - -# startup option(default "-vvv") -OPTIONS= - -# change default start run level(if none empty; /etc/init.d/shorewall-lite enable) -START=50 - -# change default stop run level(if none empty; /etc/init.d/shorewall-lite enable) -STOP= - -# option to pass when shorewall start is executed -STARTOPTIONS= - -# option to pass when shorewall restart is executed -RESTARTOPTIONS= - -# option to pass when shorewall reload is executed -RELOADOPTIONS= - -# option to pass when shorewall stop is executed -STOPOPTIONS= - -# option to pass when shorewall status is executed -STATUSOPTIONS=