홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
a84637c7 1 parent a7cd9d75

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