Changeset 2736
- Timestamp:
- 07/13/08 19:51:18 (4 months ago)
- Files:
-
- trunk/configure.ac (modified) (1 diff)
- trunk/lib/cflags-v13.c (modified) (1 diff)
- trunk/lib/vserver.h (modified) (1 diff)
- trunk/scripts/util-vserver-vars.pathsubst (modified) (1 diff)
- trunk/scripts/vserver.functions (modified) (3 diffs)
- trunk/scripts/vserver.start (modified) (2 diffs)
- trunk/scripts/vserver.stop (modified) (2 diffs)
- trunk/scripts/vserver.suexec (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/configure.ac
r2714 r2736 58 58 ENSC_PATHPROG(VCONFIG, vconfig,, [See http://www.candelatech.com/~greear/vlan.html; usually this tool is shipped in the 'vconfig' or 'vlan' package of your distribution]) 59 59 ENSC_PATHPROG(WGET, wget) 60 ENSC_PATHPROG(IONICE, ionice) 60 61 ENSC_PATHPROG(FILE, file, [file]) 61 62 ENSC_PATHPROG(GZIP, gzip, [gzip]) trunk/lib/cflags-v13.c
r2533 r2736 66 66 DECL("prolific", VC_VXF_PROLIFIC), 67 67 DECL("igneg_nice", VC_VXF_IGNEG_NICE), 68 DECL("igneg_ionice", VC_VXF_IGNEG_IONICE), 68 69 69 70 // Some pseudo flags trunk/lib/vserver.h
r2732 r2736 196 196 197 197 #define VC_VXF_IGNEG_NICE (1ULL<<52) 198 #define VC_VXF_IGNEG_IONICE (1ULL<<53) 198 199 199 200 trunk/scripts/util-vserver-vars.pathsubst
r2692 r2736 154 154 _WC="@WC@" 155 155 _WGET="@WGET@" 156 _IONICE="@IONICE@" 156 157 157 158 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=106057 trunk/scripts/vserver.functions
r2730 r2736 21 21 22 22 declare -a NICE_CMD=() 23 declare -a IONICE_CMD=() 23 24 declare -a CHBIND_CMD=() 24 25 declare -a CAP_OPTS=() … … 136 137 } 137 138 139 function _generateIONiceCommand 140 { 141 local vdir=$1 142 local ionice_class=2 143 local ionice_priority=0 144 145 test -r "$vdir/ionice/class" && read ionice_class <"$vdir"/ionice/class 146 test -r "$vdir/ionice/priority" && read ionice_priority <"$vdir"/ionice/priority 147 148 IONICE_CMD=( $_IONICE -c$ionice_class -n$ionice_priority ) 149 } 138 150 139 151 function _generatePersonalityOptions … … 813 825 test -n "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$1" 814 826 _generateNiceCommand "$1" 827 _generateIONiceCommand "$1" 815 828 _generateInitOptions "$1" 816 829 _generateChcontextOptions "$1" trunk/scripts/vserver.start
r2735 r2736 134 134 is_configured=1 135 135 if $_VSERVER_INFO - FEATURE migrate; then 136 ${IONICE_CMD[@]} \ 136 137 ${NICE_CMD[@]} \ 137 138 "${CHBIND_CMD[@]}" \ … … 164 165 fi 165 166 167 ${IONICE_CMD[@]} \ 166 168 ${NICE_CMD[@]} \ 167 169 "${CHBIND_CMD[@]}" \ trunk/scripts/vserver.stop
r2704 r2736 81 81 fi 82 82 elif $_VSERVER_INFO - FEATURE migrate; then 83 "${IONICE_CMD[@]}" \ 83 84 "${NICE_CMD[@]}" \ 84 85 "${CHBIND_CMD[@]}" \ … … 88 89 "${INITCMD_STOP[@]}" || fail=1 89 90 else 91 "${IONICE_CMD[@]}" \ 90 92 "${NICE_CMD[@]}" \ 91 "$ _CHBIND" "${CHBIND_OPTS[@]}" \93 "${CHBIND_CMD[@]}" \ 92 94 "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ 93 95 $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" \ trunk/scripts/vserver.suexec
r2669 r2736 35 35 if test -z "$is_stopped"; then 36 36 exec \ 37 "${IONICE_CMD[@]}" \ 37 38 "${NICE_CMD[@]}" \ 38 39 "${CHBIND_CMD[@]}" \ … … 46 47 else 47 48 exec \ 49 "${IONICE_CMD[@]}" \ 48 50 "${NICE_CMD[@]}" \ 49 51 "${CHBIND_CMD[@]}" \ … … 58 60 else 59 61 exec \ 62 "${IONICE_CMD[@]}" \ 60 63 "${NICE_CMD[@]}" \ 61 64 "${CHBIND_CMD[@]}" \
