Updating bin/karaf to fix ^D
Karaf's ConsoleImpl does the wrong thing with ^D; the underlying
ConsoleReader already knows what to do.
Change-Id: I2276c34e4219894fb394b560cce5ff8a2503e95a
diff --git a/tools/build/onos-package b/tools/build/onos-package
index 471d25c..5feef00 100755
--- a/tools/build/onos-package
+++ b/tools/build/onos-package
@@ -84,6 +84,10 @@
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