diff options
| author | hshaw <none@none> | 2006-08-22 04:36:17 -0700 |
|---|---|---|
| committer | hshaw <none@none> | 2006-08-22 04:36:17 -0700 |
| commit | a1e4d62bc1ea0bd683c63f185da43cda7aec8f20 (patch) | |
| tree | e25858d68505d5aae1b2a88750a7349e76191164 /usr/src/cmd/svc | |
| parent | 023ccc1e19f859b2016632db1dac0290517ea57c (diff) | |
| download | illumos-joyent-a1e4d62bc1ea0bd683c63f185da43cda7aec8f20.tar.gz | |
6184360 /lib/svc/method/svc-mdmonitor may leave tmpfiles
6240575 some methods which should be using $SMF_FMRI are not
6441739 mdmonitor service method can exit with success when it should fail
Diffstat (limited to 'usr/src/cmd/svc')
| -rw-r--r-- | usr/src/cmd/svc/milestone/console-login | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/usr/src/cmd/svc/milestone/console-login b/usr/src/cmd/svc/milestone/console-login index fdd8bdcbb1..6e4a733d87 100644 --- a/usr/src/cmd/svc/milestone/console-login +++ b/usr/src/cmd/svc/milestone/console-login @@ -35,16 +35,14 @@ # svc:/system/console-login> setprop ttymon/terminal_type = "xterm" # svc:/system/console-login> exit -FMRI=svc:/system/console-login - getproparg() { - val=`svcprop -p $2 $FMRI` + val=`svcprop -p $2 $SMF_FMRI` [ -n "$val" ] && [ "$val" != "\"\"" ] && echo $1 $val } args="-g" -val=`svcprop -p ttymon/device $FMRI` +val=`svcprop -p ttymon/device $SMF_FMRI` # if this isn't set, recover a little [ -z "$val" ] && val=/dev/console args="$args -d $val" @@ -55,13 +53,13 @@ args="$args `getproparg -T ttymon/terminal_type`" args="$args `getproparg -m ttymon/modules`" -val=`svcprop -p ttymon/nohangup $FMRI` +val=`svcprop -p ttymon/nohangup $SMF_FMRI` [ "$val" = "true" ] && args="$args -h" -val=`svcprop -p ttymon/timeout $FMRI` +val=`svcprop -p ttymon/timeout $SMF_FMRI` [ -n "$val" -a "$val" != "0" ] && args="$args -t $val" -val=`svcprop -p ttymon/prompt $FMRI` +val=`svcprop -p ttymon/prompt $SMF_FMRI` if [ -n "$val" ]; then prompt=`eval echo $val` exec /usr/lib/saf/ttymon $args -p "`eval echo $prompt` " |