Browse code

Append command to screenrc after we update it

If a group is specified we modify the command to run under "sg". This
currently isn't reflected in screenrc so rejoining fails

Change-Id: I5c18ba664a6ae9ba9aaa4439a9086bc85085cd75
Closes-Bug: #1444267

Ian Wienand authored on 2015/04/16 07:43:43
Showing 1 changed files
... ...
@@ -1235,9 +1235,6 @@ function screen_process {
1235 1235
     SERVICE_DIR=${SERVICE_DIR:-${DEST}/status}
1236 1236
     USE_SCREEN=$(trueorfalse True USE_SCREEN)
1237 1237
 
1238
-    # Append the process to the screen rc file
1239
-    screen_rc "$name" "$command"
1240
-
1241 1238
     screen -S $SCREEN_NAME -X screen -t $name
1242 1239
 
1243 1240
     local real_logfile="${LOGDIR}/${name}.log.${CURRENT_LOG_TIME}"
... ...
@@ -1277,6 +1274,10 @@ function screen_process {
1277 1277
     if [[ -n "$group" ]]; then
1278 1278
         command="sg $group '$command'"
1279 1279
     fi
1280
+
1281
+    # Append the process to the screen rc file
1282
+    screen_rc "$name" "$command"
1283
+
1280 1284
     screen -S $SCREEN_NAME -p $name -X stuff "$command & echo \$! >$SERVICE_DIR/$SCREEN_NAME/${name}.pid; fg || echo \"$name failed to start\" | tee \"$SERVICE_DIR/$SCREEN_NAME/${name}.failure\"$NL"
1281 1285
 }
1282 1286