diff options
| author | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2017-10-21 19:28:30 +0200 |
|---|---|---|
| committer | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2017-10-21 19:28:30 +0200 |
| commit | a8f8900664795dfc26597e0fd8b6c76d7f7eaaa6 (patch) | |
| tree | 332fb08bc7276d15c1c6bab858d6e83725f0a5dd /nfs | |
| parent | 842f5f860061d2c324606b455bdb51dffee412a0 (diff) | |
| download | eficast-a8f8900664795dfc26597e0fd8b6c76d7f7eaaa6.tar.gz eficast-a8f8900664795dfc26597e0fd8b6c76d7f7eaaa6.tar.bz2 eficast-a8f8900664795dfc26597e0fd8b6c76d7f7eaaa6.zip | |
Make sound working, rework on rescue logic, limit shell levels
Diffstat (limited to 'nfs')
| -rwxr-xr-x | nfs/autorun.sh | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/nfs/autorun.sh b/nfs/autorun.sh index a998b13..ad99a8e 100755 --- a/nfs/autorun.sh +++ b/nfs/autorun.sh @@ -2,7 +2,7 @@ rest10() { # Let the user read machine_info and other usefull informations on console (or skip with Enter) - read -t10 -p 'Press Enter or wait 10 sec...' + sfx_question ; read -t10 -p 'Press Enter or wait 10 sec...' # Make some blank lines on console echo -e '\n\n\n\n\n' } @@ -22,16 +22,10 @@ firstdisk_test || exit 2 # Run the main action script if nfswrite_test -then rest10 # Let user cancel it - source $scriptdir/image_deploy.sh # Start deploy script +then # Start deploy script after letting a chance to cancel it + rest10 ; source $scriptdir/image_deploy.sh -else # Start capture script if all it needs is available - if scriptavailability_test image_capture_${hostname}.sh - then rest10 # Let user cancel it - source $scriptdir/image_capture.sh - # else No wait, nothing to do, go to eficast_end directly - fi +else scriptavailability_test image_capture_${hostname}.sh || exit 3 + # Start capture script if all it needs is available + rest10 ; source $scriptdir/image_capture.sh fi - -# Display ending message then reboot -eficast_end |