Revert "Updating bin/karaf to fix ^D"

This change blocks ^C which is need to quit from log:tail

This reverts commit a84637c7.

Change-Id: Ifb0c2f67bb8719ca898ec1f9c7ad2d7f002db90a

@@ -84,10 +84,6 @@ function build_stage_dir() {
     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

@@ -137,12 +137,6 @@ if ! grep -q ",onos-api," $KARAF_ROOT/etc/org.apache.karaf.features.cfg; then
         $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..."

@@ -44,9 +44,6 @@ perl -pi.old -e "s|^(featuresRepositories=).*|\1mvn:org.apache.karaf.features/st
 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