Index: scripts/setup.sh =================================================================== diff -u -rfe20dd714879e85a467516d379e210e5b9040205 -rb1c2f458dc6c49c923938f51a2a1a8f4ca130f2f --- scripts/setup.sh (.../setup.sh) (revision fe20dd714879e85a467516d379e210e5b9040205) +++ scripts/setup.sh (.../setup.sh) (revision b1c2f458dc6c49c923938f51a2a1a8f4ca130f2f) @@ -28,12 +28,12 @@ echo_dash_message "No SD-Card detected" echo_dash_message "UI Software logging will not work without a SD-Card" echo_dash_message "Insert a SD-Card and continue when ready" - echo_dash_comment + echo_dash_comment confirm "Continue" if [ $? -eq $FALSE ]; then exit $ERR_SD_CARD fi - else + else break fi done @@ -50,9 +50,9 @@ confirm "Do you want to format the SD-Card" if [ $? -eq $FALSE ]; then # give user an option to skip the format return $? - fi + fi fi - + while true; do echo "Unmount the SD-Card if is in use" umount "$SDCARD_PRT" @@ -70,7 +70,7 @@ break fi done - + echo "Removing current partitions" sfdisk --delete $SDCARD_DEV 1>/dev/null 2>/dev/null echo "Create new partition" @@ -91,7 +91,7 @@ echo "setup the time/date controller" # to use the system time/date and not use the network time protocol timedatectl set-ntp $TDCTL_NTP_USED - + echo "Setup the timezone (PDT Pacific)" timedatectl set-timezone $TDCTL_TIMEZONE timedatectl set-local-rtc $TDCTL_RTC_LOCL @@ -124,13 +124,13 @@ function setup_denali() { echo "Setting denali as default auto start application" - + chmod a+x $HOME/$INITD_AUTOSTART chmod a+x $HOME/$LAUNCH_SCR chmod a+x $HOME/$DENALI_BIN - + rm -f "$POSTLOG" "$POSTERR" "$POSTOUT" - + echo "Syncing file system updates" sync;sync;sync } @@ -155,12 +155,12 @@ function executionMode() { if [ "$(grep $SETUP_ENABLE_MANUFACTURING_MODE $SETUP_CONF_FILE)" = "" ]; then - # -U for Maunufacturing mode - # -a for disabling the non-minimizable Alarms + # -U for Updating mode + # -a for disabling the non-minimizable Alarms APPLICATION_PARAMS="-U -a" else - # -E for Updating mode - # -a for disabling the non-minimizable Alarms + # -E for Maunufacturing mode + # -a for disabling the non-minimizable Alarms APPLICATION_PARAMS="-E -a" fi enableDRT