commit a84637c702a45e8e70f05f0437217f15930a7135
author Brian O'Connor <bocon@onlab.us> Tue May 10 19:16:18 2016 -0700
committer Brian O'Connor <bocon@onlab.us> Tue May 10 19:16:53 2016 -0700
tree 1b7db7a5a95e645bcf24de666a74d548f6bf4cac
parent a7cd9d75f70abfdb9a662b21606556e07a2f7c8a

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

tools/build/onos-package

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

tools/dev/bin/onos-setup-karaf

diff --git a/tools/dev/bin/onos-setup-karaf b/tools/dev/bin/onos-setup-karaf
index 84e9c94..e310c24 100755
--- a/tools/dev/bin/onos-setup-karaf
+++ b/tools/dev/bin/onos-setup-karaf
@@ -137,6 +137,12 @@
         $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..."

tools/package/onos-prep-karaf

diff --git a/tools/package/onos-prep-karaf b/tools/package/onos-prep-karaf
index 6564d5f..309be06 100755
--- a/tools/package/onos-prep-karaf
+++ b/tools/package/onos-prep-karaf
@@ -44,6 +44,9 @@
 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