Hi Tom, Still with debian 8 and ssystemd the "configure" 5.0.2 bash script had a few issues.
Changes made: -- Changed the line that determine the vendor to be used. -- Added an if statement that will try to determine which version of the shorewallrc file will be used if invoke as "host=debian". -- An elif that will set the host and vendor to debian. -- The line: 'echo "# Default parameters file: $rcfile" >> shorewallrc' was added. Attached as unified diff(diff -u ...)! -Matt On 24 Nov 2015 at 8:35, Tom Eastep wrote: > On 11/24/2015 6:42 AM, matt darfeuille wrote: > > Ok Tom, > > > > If you like I can resend them as unified diffs and do shorewall-lite > > as well! > > > > Not necessary this time, Matt. > > Thanks, > -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 \________________________________________________ > > ------------------------------------------------------------------------------ > Go from Idea to Many App Stores Faster with Intel(R) XDK > Give your users amazing mobile app experiences with Intel(R) XDK. > Use one codebase in this all-in-one HTML5 development environment. > Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs. > http://pubads.g.doubleclick.net/gampad/clk?id=254741551&iu=/4140 > _______________________________________________ > Shorewall-users mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/shorewall-users -------------- Enclosure number 1 ---------------- --- configure 2015-11-28 15:11:41.416851499 +0100 +++ shorewall-core-5.0.2/configure 2015-11-28 14:54:35.360574672 +0100 @@ -102,7 +102,7 @@ vendor=redhat ;; debian|ubuntu) - ls -l /sbin/init |fgrep -q systemd | vendor=debian.systemd | vendor=debian.sysvinit + ls -l /sbin/init | fgrep -q systemd && vendor=debian.systemd || vendor=debian.sysvinit ;; opensuse) vendor=suse @@ -122,7 +122,6 @@ params[HOST]=apple rcfile=shorewallrc.apple ;; - cygwin*|CYGWIN*) params[HOST]=cygwin rcfile=shorewallrc.cygwin @@ -130,7 +129,7 @@ *) if [ -f /etc/debian_version ]; then params[HOST]=debian - rcfile=shorewallrc.debian.sysvinit + ls -l /sbin/init | fgrep -q systemd && rcfile=shorewallrc.debian.systemd || rcfile=shorewallrc.debian.sysvinit elif [ -f /etc/redhat-release ]; then params[HOST]=redhat rcfile=shorewallrc.redhat @@ -152,18 +151,25 @@ fi ;; esac - vendor=${params[HOST]} elif [ $vendor = linux ]; then rcfile=shorewallrc.default; else +if [ ${params[HOST]} = debian -a -f /etc/debian_version ]; then + ls -l /sbin/init | fgrep -q systemd && vendor=debian.systemd || vendor=debian.sysvinit +fi + rcfile=shorewallrc.$vendor + if [ ! -f $rcfile ]; then echo "ERROR: $vendor is not a recognized host type" >&2 exit 1 elif [ $vendor = default ]; then params[HOST]=linux vendor=linux +elif [ $vendor = debian.systemd -o $vendor = debian.sysvinit ]; then + params[HOST]=debian + vendor=debian fi fi @@ -183,6 +189,7 @@ echo '#' > shorewallrc echo "# Created by Shorewall Core version $VERSION configure - " `date` >> shorewallrc + echo "# Default parameters file: $rcfile" >> shorewallrc echo '#' >> shorewallrc if [ $# -gt 0 ]; then ------------------------------------------------------------------------------ _______________________________________________ Shorewall-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-users
