On 10/2/2014 4:55 PM, PGNd wrote: > On Thu, Oct 2, 2014, at 04:37 PM, Tom Eastep wrote: > >> Your two emails were identical except for the subject, so I only know >> about the third issue. >
> Agh, again. Copy-n-paste-itis. Sry. THIS email was SUPPOSED to have
> the FOLLOWING content (Now that I've royally screwed this up, I'll just
> paste it here, rather than tryting to edit/change titles.)
> ----------------------------------------
> installing tarball builds
>
> if I install PRODUCTS = shorewall-core shorewall-lite
>
> cd ./shorewall-core-4.6.4-Beta2-19-g205dd6e
> cat shorewallrc.suse
> HOST=suse
> PREFIX=/usr/local/shorewall-custom
> SHAREDIR=${PREFIX}/share
> LIBEXECDIR=${PREFIX}/lib
> PERLLIBDIR=${PREFIX}/lib/perl5
> CONFDIR=${PREFIX}/etc
> SBINDIR=${PREFIX}/usr/sbin
> MANDIR=${PREFIX}/man/
> INITDIR=${PREFIX}/etc/init.d
> INITSOURCE=init.suse.sh
> INITFILE=${PRODUCT}
> AUXINITSOURCE=
> AUXINITFILE=
> SYSTEMD=${PREFIX}/etc/systemd
> SERVICEFILE=${PRODUCT}.service
> SYSCONFFILE=sysconfig
> SYSCONFDIR=${PREFIX}/etc/sysconfig/
> SPARSE=
> ANNOTATED=
> VARLIB=/var/lib
> VARDIR=${VARLIB}/${PRODUCT}-custom
>
> rm -rf /usr/local/shorewall-custom
> ./install.sh shorewallrc.suse
> ls -al /usr/local/shorewall-custom/etc/init.d
> ls: cannot access /usr/local/shorewall-custom/etc/init.d: No
> such file or directory
>
> I see an install fail for a missing init.d dir
>
> cd ../shorewall-lite-4.6.4-Beta2-19-g205dd6e
> ./install.sh shorewallrc.suse
> Installing Suse-specific configuration...
> Installing Shorewall Lite Version 4.6.4-Beta2-19-g205dd6e
> Shorewall Lite control program installed in
> /usr/local/shorewall-custom/usr/sbin/shorewall-lite
> install: cannot create regular file
> ‘//usr/local/shorewall-custom/etc/init.d/shorewall-lite’: No such file or
> directory
>
> ERROR: Failed to install -T -o root -g root -m 0544
> init.suse.sh //usr/local/shorewall-custom/etc/init.d/shorewall-lite
>
> ls -al /usr/local/shorewall-custom/etc/init.d
> ls: cannot access /usr/local/shorewall-custom/etc/init.d: No
> such file or directory
>
> OTOH, if I install PRODUCTS = shorewall-core shorewall shorewall-lite
>
> cd ./shorewall-core-4.6.4-Beta2-19-g205dd6e
> rm -rf /usr/local/shorewall-custom
> ./install.sh shorewallrc.suse
> cd ../shorewall-4.6.4-Beta2-19-g205dd6e
> ./install.sh shorewallrc.suse
> ls -al /usr/local/shorewall-custom/etc/init.d
> total 12K
> drwxr-xr-x+ 2 root root 4.0K Oct 2 13:37 ./
> drwxr-xr-x+ 6 root root 4.0K Oct 2 13:37 ../
> -r-xr--r--+ 1 root root 3.0K Oct 2 13:37 shorewall*
>
> the init.d dir is 1st created by the shorewall PRODUCT install, then
The attached patch should correct that. Although again, so would using
DESTDIR with the code you have...
-Tom
--
Tom Eastep \ When I die, I want to go like my Grandfather who
Shoreline, \ died peacefully in his sleep. Not screaming like
Washington, USA \ all of the passengers in his car
http://shorewall.net \________________________________________________
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 47a5678..7c2aea6 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -346,6 +346,7 @@ fi
delete_file ${DESTDIR}/usr/share/$PRODUCT/xmodules
install_file $PRODUCT ${DESTDIR}${SBINDIR}/$PRODUCT 0544
+[ -n "${INITFILE}" ] && install -d $OWNERSHIP -m 755 ${DESTDIR}${INITDIR}
echo "$Product control program installed in ${DESTDIR}${SBINDIR}/$PRODUCT"
@@ -499,7 +500,7 @@ chmod 644 ${DESTDIR}${SHAREDIR}/$PRODUCT/version
# Remove and create the symbolic link to the init script
#
-if [ -z "${DESTDIR}${SYSTEMD}" ]; then
+if [ -z "${DESTDIR}" -a -n "${INITFILE}" ]; then
rm -f ${SHAREDIR}/$PRODUCT/init
ln -s ${INITDIR}/${INITFILE} ${SHAREDIR}/$PRODUCT/init
fi
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 714c59b..3cf3dd3 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -1120,7 +1120,7 @@ chmod 644 ${DESTDIR}${SHAREDIR}/$PRODUCT/version
# Remove and create the symbolic link to the init script
#
-if [ -z "${DESTDIR}${SYSTEMD}" ]; then
+if [ -z "${DESTDIR}" -a -n "${INITFILE}" ]; then
rm -f ${SHAREDIR}/$PRODUCT/init
ln -s ${INITDIR}/${INITFILE} ${SHAREDIR}/$PRODUCT/init
fi
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
_______________________________________________ Shorewall-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-users
