Revert "Updating bin/karaf to fix ^D"
This change blocks ^C which is need to quit from log:tail
This reverts commit a84637c702a45e8e70f05f0437217f15930a7135.
Change-Id: Ifb0c2f67bb8719ca898ec1f9c7ad2d7f002db90a
diff --git a/tools/build/onos-package b/tools/build/onos-package
index 5feef00..471d25c 100755
--- a/tools/build/onos-package
+++ b/tools/build/onos-package
@@ -84,10 +84,6 @@
perl -pi.old -e "s|^(featuresBoot=.*)|\1,$BOOT_FEATURES|" \
$ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg
- # Patch the karaf start script to disable user interrupts
- perl -pi.old -e "s|(-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true)|\1 -Dkaraf.ignoreInterrupts=true|" \
- $ONOS_STAGE/$KARAF_DIST/bin/karaf
-
# Patch the Apache Karaf distribution with ONOS branding bundle
cp $M2_REPO/org/onosproject/onos-branding/$ONOS_POM_VERSION/onos-branding-*.jar \
$ONOS_STAGE/$KARAF_DIST/lib
diff --git a/tools/dev/bin/onos-setup-karaf b/tools/dev/bin/onos-setup-karaf
index e310c24..84e9c94 100755
--- a/tools/dev/bin/onos-setup-karaf
+++ b/tools/dev/bin/onos-setup-karaf
@@ -137,12 +137,6 @@
$KARAF_ROOT/etc/org.apache.karaf.features.cfg
fi
-if ! grep -q "ignoreInterrupts" $KARAF_ROOT/bin/karaf; then
- # Patch the karaf start script to disable user interrupts
- perl -pi.old -e "s|(-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true)|\1 -Dkaraf.ignoreInterrupts=true|" \
- $KARAF_ROOT/bin/karaf
-fi
-
if [ ! -f $KARAF_ROOT/lib/onos-branding-$ONOS_POM_VERSION.jar ]; then
# Patch the Apache Karaf distribution with ONOS branding bundle
echo "Branding as ONOS..."
diff --git a/tools/package/onos-prep-karaf b/tools/package/onos-prep-karaf
index 309be06..6564d5f 100755
--- a/tools/package/onos-prep-karaf
+++ b/tools/package/onos-prep-karaf
@@ -44,9 +44,6 @@
perl -pi.old -e "s|^(featuresBoot=).*|\1$BOOT_FEATURES|" \
$KARAF_DIR/etc/org.apache.karaf.features.cfg
-# Patch the karaf start script to disable user interrupts
-perl -pi.old -e "s|(-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true)|\1 -Dkaraf.ignoreInterrupts=true|" \
- $KARAF_DIR/bin/karaf
# Patch the Apache Karaf distribution with ONOS branding bundle
cp $BRANDING $KARAF_DIR/lib