diff options
Diffstat (limited to 'abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp')
| -rwxr-xr-x | abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp | 53 |
1 files changed, 32 insertions, 21 deletions
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp index 6f4252f..a067f98 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp @@ -23,10 +23,9 @@ WelcomeDialog::WelcomeDialog(MythScreenStack *parent, const char *name) - :MythScreenType(parent, name), - m_status_text(NULL), m_recording_text(NULL), m_scheduled_text(NULL), - m_time_text(NULL), m_date_text(NULL), - m_menuPopup(NULL), m_mv_text(NULL) + :MythScreenType(parent, name), m_menuPopup(NULL), + m_status_text(NULL),m_recording_text(NULL), m_scheduled_text(NULL), + m_mv_text(NULL), m_time_text(NULL), m_date_text(NULL) { // system("rm -f /tmp/.install_state"); @@ -104,9 +103,11 @@ void WelcomeDialog::shutdownNow(int rc) // system("rm -f /tmp/.install_percent"); // system("rm -f /tmp/.install_error"); if (rc == 1) - system("/sbin/halt"); + if(!system("/sbin/halt")) + LOG(VB_GENERAL, LOG_ERR, "Error running halt"); else - system("/sbin/reboot"); + if(!system("/sbin/reboot")) + LOG(VB_GENERAL, LOG_ERR, "Error running reboot"); } void WelcomeDialog::runLIVECD(void) @@ -159,7 +160,8 @@ bool WelcomeDialog::keyPressEvent(QKeyEvent *event) // QByteArray tmp = cmd.toAscii(); // QByteArray tmp = cmd; // system(tmp); - system(qPrintable(cmd)); + if(!system(qPrintable(cmd))) + LOG(VB_GENERAL, LOG_ERR, "Error running MythShutdownXTermCMD"); } } else @@ -174,7 +176,6 @@ bool WelcomeDialog::keyPressEvent(QKeyEvent *event) void WelcomeDialog::closeDialog() { Close(); - exit(0); } @@ -229,7 +230,8 @@ void WelcomeDialog::updateScreen(void) QString cmdtxt; cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh " ); - system(qPrintable(cmdtxt)); + if(!system(qPrintable(cmdtxt))) + LOG(VB_GENERAL, LOG_ERR, "Error running install_proxy.sh"); recording_text="Press MENU for Options"; mythvantage_text=" "; error_text=" "; @@ -522,7 +524,7 @@ QString WelcomeDialog::findinstallsouce(void) { getline (mountfile,line); if ( line.empty() ) - line = "oops didn't find andthing"; + line = "oops didn't find anything"; currentitem= ( QString::fromStdString( line ) ); @@ -867,7 +869,8 @@ void WelcomeDialog::install_generic(void) QString cmdtxt; cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh find_update " + install_drive +" &"); - system(qPrintable(cmdtxt)); + if(!system(qPrintable(cmdtxt))) + LOG(VB_GENERAL, LOG_ERR, "Could not run install_proxy.sh find update"); busy_find_oldsettings(); bool flag = false; QString line; @@ -1000,14 +1003,14 @@ int WelcomeDialog::ask_validate_network(void) QString cmdtxt; cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh network_check_it setup_network &"); - retval = system(qPrintable(cmdtxt)); + retval = system(qPrintable(cmdtxt)); busy_network(); if (network_check) { network_check->setProgress(2); cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh network_check_it check_self"); - retval = system(qPrintable(cmdtxt)); + retval = system(qPrintable(cmdtxt)); if ( retval != 0 ) { network_check->Close(); @@ -1020,7 +1023,7 @@ int WelcomeDialog::ask_validate_network(void) network_check->setProgress(3); cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh network_check_it check_gw"); - retval = system(qPrintable(cmdtxt)); + retval = system(qPrintable(cmdtxt)); if ( retval != 0 ) { network_check->Close(); @@ -1033,7 +1036,7 @@ int WelcomeDialog::ask_validate_network(void) network_check->setProgress(4); cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh network_check_it check_ns"); - retval = system(qPrintable(cmdtxt)); + retval = system(qPrintable(cmdtxt)); if ( retval != 0 ) { network_check->Close(); @@ -1046,7 +1049,7 @@ int WelcomeDialog::ask_validate_network(void) network_check->setProgress(5); cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh network_check_it check_names"); - retval = system(qPrintable(cmdtxt)); + retval = system(qPrintable(cmdtxt)); if ( retval != 0 ) { network_check->Close(); @@ -1059,7 +1062,7 @@ int WelcomeDialog::ask_validate_network(void) network_check->setProgress(6); cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh network_check_it host_names"); - retval = system(qPrintable(cmdtxt)); + retval = system(qPrintable(cmdtxt)); if ( retval != 0 ) { network_check->Close(); @@ -1154,14 +1157,18 @@ void WelcomeDialog::install_it(void) QString cmdtxt=MV_ROOT ; //cmdtxt.append("bin/install_proxy.sh full_install_it " + install_drive + " " + rootfs + " " + rootsize + " " + datafs + " " + datasize + " " + swapsize + "&"); cmdtxt.append("bin/install_proxy.sh full_install_it &"); - system(qPrintable(cmdtxt)); + if(!system(qPrintable(cmdtxt))) + LOG(VB_GENERAL, LOG_ERR, "Error running install_proxy.sh full_install_it"); + } else if ( installtype == "Upgrade" ) { QString cmdtxt=MV_ROOT ; //cmdtxt.append("bin/install_proxy.sh upgrade_it " + install_drive + " " + uprootfs + "&"); cmdtxt.append("bin/install_proxy.sh upgrade_it &"); - system(qPrintable(cmdtxt)); + if(!system(qPrintable(cmdtxt))) + LOG(VB_GENERAL, LOG_ERR, "Error running install_proxy.sh upgrade_it"); + } else if (installtype=="NET") { @@ -1178,11 +1185,15 @@ void WelcomeDialog::install_it(void) QString h; h=localhostname; cmdtxt.append("bin/restore_default_settings.sh -c save -t syssettings -d 127.0.0.1 -h " + h); - system(qPrintable(cmdtxt)); + if(!system(qPrintable(cmdtxt))) + LOG(VB_GENERAL, LOG_ERR, "Error running restore_default_settings.sh"); + cmdtxt=MV_ROOT ; //cmdtxt.append("bin/install_proxy.sh NETBOOT " + install_drive + " &"); cmdtxt.append("bin/install_proxy.sh NETBOOT &"); - system(qPrintable(cmdtxt)); + if(!system(qPrintable(cmdtxt))) + LOG(VB_GENERAL, LOG_ERR, "Error running install_proxy.sh NETBOOT"); + } WORKING_ON_INSTALL = true; |