diff options
| -rwxr-xr-x | scripts/mode-util | 6 | ||||
| -rwxr-xr-x | scripts/system-installer | 7 | ||||
| -rwxr-xr-x | scripts/url-util | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/scripts/mode-util b/scripts/mode-util index 63a082a..e88de20 100755 --- a/scripts/mode-util +++ b/scripts/mode-util @@ -9,9 +9,9 @@ utilspath=/usr/lib/system-installer trap "exit 1" SIGINT -dialog_helper --no-items --item-help --menu "Select your installation mode" 15 70 15 \ -"basic" "Put the whole url of the image that you want to install." \ -"custom" "Browse through the download.tizen.org directories and select the image that you want to install." +dialog_helper --no-items --item-help --menu "Select your installation option" 15 70 15 \ +"preset" "Browse through the download.tizen.org directories and select the image that you want to install." \ +"url" "Put the whole url of the image that you want to install." cat << EOC > $outfile $(echo "$DIALOGRES") diff --git a/scripts/system-installer b/scripts/system-installer index 461bc8b..c0b8fed 100755 --- a/scripts/system-installer +++ b/scripts/system-installer @@ -23,12 +23,17 @@ # Being connected to the internet before launching this script is # better. If you aren't connected, a wifi configuration script will be fired. + echo -e "2\t2\t2\t2" > /proc/sys/kernel/printk chvt 2 export HOME="/root" +# disable journald log +systemctl stop systemd-journald.service +systemctl mask systemd-journald.service + # Used to retrieve output of the other scripts output_data_file="/tmp/system-installer.$$" @@ -141,7 +146,7 @@ rm -f "$output_data_file" 2>/dev/null # os install confirmation os_install_lost="Do you want to proceed with the installation ? All your data on the target device will be lost." -$DIALOG --yesno "${os_install_lost}" 15 70 || sigint_handler +$DIALOG --defaultno --yesno "${os_install_lost}" 15 70 || sigint_handler # Download and install the image" install_os diff --git a/scripts/url-util b/scripts/url-util index 94aabae..bd0035a 100755 --- a/scripts/url-util +++ b/scripts/url-util @@ -8,7 +8,7 @@ #!/bin/bash outfile=${1:-/dev/stdout} -mode=${2:-"basic"} +mode=${2:-"preset"} BASE_URL="http://download.tizen.org/" IMAGE_URL= @@ -97,7 +97,7 @@ function enter_url() { ####################################################### -if [ "$mode" = "custom" ]; then +if [ "$mode" = "preset" ]; then IMAGE_URL+=$BASE_URL select_topdir || exit 1 @@ -121,7 +121,7 @@ if [ "$mode" = "custom" ]; then IMAGE_URL+=$(echo $curdir/*.raw.*) -elif [ "$mode" = "basic" ]; then +elif [ "$mode" = "url" ]; then enter_url fi |