홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
Committed by Gerrit Code Review
1314f8c8 1 parent 3106e468

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
Inline Side-by-side
Showing 3 changed files with 0 additions and 13 deletions
...@@ -84,10 +84,6 @@ function build_stage_dir() { ...@@ -84,10 +84,6 @@ function build_stage_dir() {
84 perl -pi.old -e "s|^(featuresBoot=.*)|\1,$BOOT_FEATURES|" \ 84 perl -pi.old -e "s|^(featuresBoot=.*)|\1,$BOOT_FEATURES|" \
85 $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg 85 $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg
86 86
87 - # Patch the karaf start script to disable user interrupts
88 - perl -pi.old -e "s|(-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true)|\1 -Dkaraf.ignoreInterrupts=true|" \
89 - $ONOS_STAGE/$KARAF_DIST/bin/karaf
90 -
91 # Patch the Apache Karaf distribution with ONOS branding bundle 87 # Patch the Apache Karaf distribution with ONOS branding bundle
92 cp $M2_REPO/org/onosproject/onos-branding/$ONOS_POM_VERSION/onos-branding-*.jar \ 88 cp $M2_REPO/org/onosproject/onos-branding/$ONOS_POM_VERSION/onos-branding-*.jar \
93 $ONOS_STAGE/$KARAF_DIST/lib 89 $ONOS_STAGE/$KARAF_DIST/lib
......
...@@ -137,12 +137,6 @@ if ! grep -q ",onos-api," $KARAF_ROOT/etc/org.apache.karaf.features.cfg; then ...@@ -137,12 +137,6 @@ if ! grep -q ",onos-api," $KARAF_ROOT/etc/org.apache.karaf.features.cfg; then
137 $KARAF_ROOT/etc/org.apache.karaf.features.cfg 137 $KARAF_ROOT/etc/org.apache.karaf.features.cfg
138 fi 138 fi
139 139
140 -if ! grep -q "ignoreInterrupts" $KARAF_ROOT/bin/karaf; then
141 - # Patch the karaf start script to disable user interrupts
142 - perl -pi.old -e "s|(-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true)|\1 -Dkaraf.ignoreInterrupts=true|" \
143 - $KARAF_ROOT/bin/karaf
144 -fi
145 -
146 if [ ! -f $KARAF_ROOT/lib/onos-branding-$ONOS_POM_VERSION.jar ]; then 140 if [ ! -f $KARAF_ROOT/lib/onos-branding-$ONOS_POM_VERSION.jar ]; then
147 # Patch the Apache Karaf distribution with ONOS branding bundle 141 # Patch the Apache Karaf distribution with ONOS branding bundle
148 echo "Branding as ONOS..." 142 echo "Branding as ONOS..."
......
...@@ -44,9 +44,6 @@ perl -pi.old -e "s|^(featuresRepositories=).*|\1mvn:org.apache.karaf.features/st ...@@ -44,9 +44,6 @@ perl -pi.old -e "s|^(featuresRepositories=).*|\1mvn:org.apache.karaf.features/st
44 perl -pi.old -e "s|^(featuresBoot=).*|\1$BOOT_FEATURES|" \ 44 perl -pi.old -e "s|^(featuresBoot=).*|\1$BOOT_FEATURES|" \
45 $KARAF_DIR/etc/org.apache.karaf.features.cfg 45 $KARAF_DIR/etc/org.apache.karaf.features.cfg
46 46
47 -# Patch the karaf start script to disable user interrupts
48 -perl -pi.old -e "s|(-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true)|\1 -Dkaraf.ignoreInterrupts=true|" \
49 - $KARAF_DIR/bin/karaf
50 47
51 # Patch the Apache Karaf distribution with ONOS branding bundle 48 # Patch the Apache Karaf distribution with ONOS branding bundle
52 cp $BRANDING $KARAF_DIR/lib 49 cp $BRANDING $KARAF_DIR/lib
......