diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index a2bd5add4..25f0f0510 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -122,9 +122,9 @@ case "\$1" in ;; iptables) echo "[iptables]" - iptables -t mangle -L QOS-OUT -v -x 2> /dev/null - iptables -t mangle -L QOS-INC -v -x 2> /dev/null - iptables -t mangle -L QOS-TOS -v -x 2> /dev/null + iptables -t mangle -n -L QOS-OUT -v -x 2> /dev/null + iptables -t mangle -n -L QOS-INC -v -x 2> /dev/null + iptables -t mangle -n -L QOS-TOS -v -x 2> /dev/null exit 0 ;; esac diff --git a/lfs/zaptel b/lfs/zaptel index 90d47a787..2377e5ec7 100644 --- a/lfs/zaptel +++ b/lfs/zaptel @@ -32,7 +32,7 @@ THISAPP = zaptel-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -ifeq "$(PASS)" "S" +ifeq "$(SMP)" "1" TARGET = $(DIR_INFO)/$(THISAPP)-smp else TARGET = $(DIR_INFO)/$(THISAPP) @@ -83,7 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) # Build Zaptel # cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/zaptel.patch -ifeq "$(PASS)" "S" +ifeq "$(SMP)" "1" cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make linux26 KVERS=$(KVER)-smp cd $(DIR_APP) && make install KVERS=$(KVER)-smp diff --git a/make.sh b/make.sh index 02d2a776e..d8e06dd44 100644 --- a/make.sh +++ b/make.sh @@ -332,7 +332,7 @@ buildipfire() { ipfiremake fcdslslusb SMP=1 ipfiremake fcpci SMP=1 # ipfiremake promise-sata-300-tx SMP=1 - ipfiremake zaptel PASS=S + ipfiremake zaptel SMP=1 ipfiremake linux ipfiremake ipp2p ipfiremake fcdsl @@ -546,7 +546,6 @@ buildinstaller() { installmake util-linux installmake pciutils installmake kudzu -# installmake bootsplash installmake installer installmake initrd }