|
@@ -45,6 +45,14 @@ __zleep_user_part_done() {
|
45
|
45
|
return $rv
|
46
|
46
|
}
|
47
|
47
|
|
|
48
|
+__zleep_min_path() {
|
|
49
|
+ echo -n $(sudo env | grep ^PATH)
|
|
50
|
+ echo -n :
|
|
51
|
+ echo -n $(dirname $(which ffoom))
|
|
52
|
+ echo -n :
|
|
53
|
+ echo -n $(dirname $(which saturnin))
|
|
54
|
+}
|
|
55
|
+
|
48
|
56
|
zleep() {
|
49
|
57
|
#
|
50
|
58
|
# Put the host on sleep
|
|
@@ -64,10 +72,12 @@ zleep() {
|
64
|
72
|
then
|
65
|
73
|
ZLEEP_ON_USER=$(mktemp)
|
66
|
74
|
ZLEEP_ON_ROOT=$(mktemp -u)
|
67
|
|
- debug -v ZLEEP_ON_USER ZLEEP_ON_ROOT
|
68
|
|
- sudo \
|
|
75
|
+ SUDO_PATH=$(__zleep_min_path) # needed while bins are still under local
|
|
76
|
+ debug -v ZLEEP_ON_USER ZLEEP_ON_ROOT SUDO_PATH
|
|
77
|
+ sudo env \
|
69
|
78
|
ZLEEP_ON_ROOT=$ZLEEP_ON_ROOT \
|
70
|
79
|
ZLEEP_ON_USER=$ZLEEP_ON_USER \
|
|
80
|
+ PATH=$SUDO_PATH \
|
71
|
81
|
saturnin iam zleeping &
|
72
|
82
|
wait_until -t 60 __zleep_sudo_part_started # i.e. password prompt done
|
73
|
83
|
__zleep_user_part
|