commit: 196659f229115844c1811c49d80450a07fa4ae30
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 18 23:42:41 2016 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 23:42:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=196659f2
net-firewall/shorewall: Adjust die messages
Since commit b8bb1a1271f we are using same runscript base file for shorewall and
shorewall-lite however die messages in the ebuild wasn't updated.
Just a small internal cosmetic change.
net-firewall/shorewall/shorewall-5.0.12.1.ebuild | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/net-firewall/shorewall/shorewall-5.0.12.1.ebuild
b/net-firewall/shorewall/shorewall-5.0.12.1.ebuild
index 1fa1d9e..54d3b67 100644
--- a/net-firewall/shorewall/shorewall-5.0.12.1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.12.1.ebuild
@@ -171,7 +171,7 @@ src_prepare() {
ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo ||
die "Failed to symlink shorewallrc.gentoo"
cp "${FILESDIR}"/shorewall.confd-r1
"${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
- cp "${FILESDIR}"/shorewall.initd-r2
"${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r1 failed"
+ cp "${FILESDIR}"/shorewall.initd-r2
"${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
cp "${FILESDIR}"/shorewall.systemd
"${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
eend 0
fi
@@ -181,8 +181,8 @@ src_prepare() {
mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to
move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo ||
die "Failed to symlink shorewallrc.gentoo"
- cp "${FILESDIR}"/shorewall.confd-r1
"${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd-r1 failed"
- cp "${FILESDIR}"/shorewall.initd-r2
"${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd-r1 failed"
+ cp "${FILESDIR}"/shorewall.confd-r1
"${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+ cp "${FILESDIR}"/shorewall.initd-r2
"${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
cp "${FILESDIR}"/shorewall6.systemd
"${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
eend 0
fi
@@ -193,7 +193,7 @@ src_prepare() {
ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo
|| die "Failed to symlink shorewallrc.gentoo"
cp "${FILESDIR}"/shorewall-lite.confd-r1
"${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1
failed"
- cp "${FILESDIR}"/shorewall-lite.initd-r2
"${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r1
failed"
+ cp "${FILESDIR}"/shorewall-lite.initd-r2
"${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2
failed"
cp "${FILESDIR}"/shorewall-lite.systemd
"${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd
failed"
eend 0
fi
@@ -203,8 +203,8 @@ src_prepare() {
mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to
move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo
|| die "Failed to symlink shorewallrc.gentoo"
- cp "${FILESDIR}"/shorewall-lite.confd-r1
"${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd-r1
failed"
- cp "${FILESDIR}"/shorewall-lite.initd-r2
"${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd-r1
failed"
+ cp "${FILESDIR}"/shorewall-lite.confd-r1
"${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1
failed"
+ cp "${FILESDIR}"/shorewall-lite.initd-r2
"${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2
failed"
cp "${FILESDIR}"/shorewall6-lite.systemd
"${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd
failed"
eend 0
fi
