Revision d3265cf9

b/snf-image-host/common.sh.in
369 369 
: ${HELPER_IMG:="@HELPER_IMG@"}
370 370 
: ${HELPER_KERNEL:="@HELPER_KERNEL@"}
371 371 
: ${HELPER_INITRD:="@HELPER_INITRD@"}
372 
: ${HELPER_PKG:="@HELPER_DIR@/snf-image-helper.deb"}
373 372 
: ${HELPER_SOFT_TIMEOUT:=20}
374 373 
: ${HELPER_HARD_TIMEOUT:=5}
375 374 
: ${HELPER_USER:="nobody"}
b/snf-image-host/defaults
32 32 
# HELPER_INITRD: Path to the helper VM initial ramdisk
33 33 
# HELPER_INITRD="${HELPER_DIR}/initrd"
34 34 

  		





  35
  
  
    
# HELPER_PKG: Path to the snf-image-helper package


  		





  36
  
  
    
# HELPER_PKG="${HELPER_DIR}/snf-image-helper.deb"


  		





  37
  
  
    

  		





  38
  35
  
    
# HELPER_TIMOUT: Soft and hard timeout limits for helper instance.


  		





  39
  36
  
    
# The helper instance will be terminated after a given time if it hasn't exited


  		





  40
  37
  
    
# by itself. A TERM signal will be send if the instance is running after


  		












  

    
      b/snf-image-host/snf-image-update-helper.in
    
  






  43
  43
  
    

  		





  44
  44
  
    
    -p PACKAGE


  		





  45
  45
  
    
        Install this deb package in the helper image, instead of the default


  		





  46
  
  
    
        [default: $HELPER_PKG]


  		





  47
  46
  
    

  		





  48
  47
  
    
    -r  Don't use any existing cache


  		





  49
  48
  
    

  		





  ......




  182
  181
  
    

  		





  183
  182
  
    
pkg_installed=$(grep snf-image-helper "$HELPER_DIR/packages" > /dev/null && echo yes)


  		





  184
  183
  
    

  		





  185
  
  
    
if [ ! -r "$HELPER_PKG" -a -z "$pkg_installed" ]; then


  		





  186
  
  
    
    log_error "ERROR:"


  		





  187
  
  
    
    log_error "Helper package \`$HELPER_PKG' does not exist or is not" \


  		





  188
  
  
    
    "readable by the script."


  		





  
  184
  
    
if [ -z "$HELPER_PKG" -a -z "$pkg_installed" ]; then


  		





  
  185
  
    
    log_error "No helper package was specified and non was found by the apt."


  		





  189
  186
  
    
    exit 1


  		





  190
  187
  
    
fi


  		





  191
  188
  
    

  		





  ......




  202
  199
  
    
    echo "snf-image-helper pkg was installed from the apt repository."


  		





  203
  200
  
    
fi


  		





  204
  201
  
    

  		





  205
  
  
    
if [ "$VERSION_CHECK" == yes ]; then


  		





  
  202
  
    
if [ "$VERSION_CHECK" == yes -a -z "$HELPER_PKG" ]; then


  		





  206
  203
  
    
    helper_version="$(grep ^snf-image-helper[[:space:]] "$HELPER_DIR/packages" | cut -f2)"


  		





  207
  204
  
    
    host_version="$(dpkg-query -W -f "\${Version}\n" snf-image-host)"


  		





  208
  205
  
    
    if [ "$host_version" != "$helper_version" ]; then


  		












Also available in:
  Unified diff