components/pconsole/patches/pconsole.sh.in.patch
author Matt Keenan <matt.keenan@oracle.com>
Fri, 19 Jun 2015 09:35:02 +0100
branchs11-update
changeset 4508 d8924d870370
parent 409 9f1b2b9b0fd9
child 5935 678e175397ac
permissions -rw-r--r--
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service) PSARC 2015/070 pecan - Lightweight Python web-framework PSARC 2015/071 PyCA Python Cryptography PSARC 2015/170 OpenStack client for Ironic (Bare Metal Provisioning) PSARC 2015/171 scp - python secure copy PSARC 2015/196 singledispatch - Single-dispatch generic functions for Python PSARC 2015/197 logutils - Set of handlers for standard Python logging library PSARC 2015/198 Support for enumerations in Python 2.6 and 2.7 PSARC 2015/250 paramiko - SSHv2 protocol implementation in Python 20547142 Request to integrate Ironic into userland 17502639 The Python paramiko module should be added to Userland 20172780 The Python module scp should be added to Userland 20180376 The Python module ironicclient should be added to Userland 20182588 The Python module pecan should be added to Userland 20465525 The PyCA cryptography module should be added to Userland 20904396 The Python module singledispatch should be added to Userland 20904413 The Python module logutils should be added to Userland 20917993 The Python enum34 module should be added to Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
409
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
*** pconsole-1.0/pconsole.sh.in.orig	Fri Jul 15 07:04:26 2011
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
--- pconsole-1.0/pconsole.sh.in	Fri Jul 15 12:17:18 2011
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
***************
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
*** 1,4 ****
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
! #! /bin/sh
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
  #
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
  #   pconsole WJ101
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
  #   Copyright (C) 2001  Walter de Jong <[email protected]>
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
--- 1,4 ----
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
! #! /bin/bash
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
  #
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
  #   pconsole WJ101
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
  #   Copyright (C) 2001  Walter de Jong <[email protected]>
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
***************
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
*** 31,41 ****
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
  	set -x
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
  fi
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
  
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
! PATH=/bin:/usr/bin:/usr/bin/X11:/usr/openwin/bin:/usr/local/bin:/usr/bsd:/usr/share/bin:/opt/bin:/etc:/usr/etc
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20
  
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    21
  prefix=@prefix@
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    22
  exec_prefix=@exec_prefix@
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    23
  bindir=@bindir@
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    24
  
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    25
  #
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    26
  #	options: you can overrule these by setting them in your environment
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    27
--- 31,42 ----
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    28
  	set -x
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    29
  fi
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    30
  
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    31
! PATH=/usr/sbin:/usr/bin:/etc
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    32
  
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    33
  prefix=@prefix@
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    34
  exec_prefix=@exec_prefix@
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    35
  bindir=@bindir@
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    36
+ sbindir=@sbindir@
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    37
  
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    38
  #
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    39
  #	options: you can overrule these by setting them in your environment
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    40
***************
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    41
*** 50,56 ****
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    42
  fi
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    43
  if [ -z "${P_CONNECT_CMD}" ]
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    44
  then
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    45
! 	P_CONNECT_CMD="${bindir}/ssh.sh"
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    46
  fi
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    47
  if [ -z "${P_CONSOLE_OPTIONS}" ]
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    48
  then
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    49
--- 51,57 ----
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    50
  fi
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    51
  if [ -z "${P_CONNECT_CMD}" ]
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    52
  then
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    53
! 	P_CONNECT_CMD="/usr/share/doc/pconsole/ssh.sh"
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    54
  fi
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    55
  if [ -z "${P_CONSOLE_OPTIONS}" ]
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    56
  then
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    57
***************
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    58
*** 145,151 ****
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    59
  	done
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    60
  
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    61
  # start pconsole
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    62
! 	${P_TERM} ${P_CONSOLE_OPTIONS} -title pconsole -name pconsole -e "${bindir}/pconsole" ${TTYS}
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    63
  
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    64
  # terminate all open windows
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    65
  	if [ ! -z "${PIDLIST}" ]
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    66
--- 146,152 ----
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    67
  	done
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    68
  
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    69
  # start pconsole
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    70
! 	${P_TERM} ${P_CONSOLE_OPTIONS} -title pconsole -name pconsole -e ${bindir}/pfexec "${sbindir}/pconsole-bin" ${TTYS}
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    71
  
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    72
  # terminate all open windows
9f1b2b9b0fd9 7067082 Move pconsole to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    73
  	if [ ! -z "${PIDLIST}" ]