1 files changed, 0 insertions, 75 deletions
diff --git a/abs/core/mythinstall/installdialog.cpp.patch b/abs/core/mythinstall/installdialog.cpp.patch
deleted file mode 100644
index b188bab..0000000
--- a/abs/core/mythinstall/installdialog.cpp.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- installdialog.cpp.orig	2013-12-05 21:06:13.358926594 +0000
-+++ installdialog.cpp	2013-12-06 17:26:16.491833828 +0000
-@@ -881,50 +881,32 @@
-             }
-             if ( flag )
-             {
--                tflag =  1;
--            }
--            else
--            {
--                cout << "searching for knoppmyth-versin" << endl;
--                //couldn't open /etc/systemconfig, so now look for /tmp/etc/Knoppmyth-version
--                QFile file("/tmp/etc/KnoppMyth-version");
--                if ( file.exists() )
--                {   //appears to be a knoppmyth version, proceed
--                    cout << "found knoppmyth-version" << endl;
--                    QFile kmfile("/tmp/etc/hostname");
--                    if ( kmfile.open(QIODevice::ReadOnly | QIODevice::Text) )
--                    {
--                        Q3TextStream t( &kmfile );        // use a text stream
--                        line = t.readLine();
--                        flag=true;
--                        currentitem = line.stripWhiteSpace();
--                        current_hostname =  currentitem   ;
--                        //gCoreContext->ActivateSettingsCache(true);
--                        gCoreContext->ClearSettingsCache();
--                        //FixME
--                        //gCoreContext->SetSetting("HostMyhostname",current_hostname);
--                        gCoreContext->SaveSetting("HostMyhostname",current_hostname);
--                    }
--                    kmfile.close();
--                    runNextSetting = ask_validate_network();
--                }
--                else
-+                //check if LinHES-release is 8.0 or newer
-+                cout << "searching for LinHES-release" << endl;
-+                //look for /tmp/etc/LinHES-release
-+                QFile file("/tmp/etc/LinHES-release");
-+                if ( file.open(QIODevice::ReadOnly | QIODevice::Text) )
-                 {
--                    //popup things went wrong
--                    DialogCode returncode  = MythPopupBox::Show2ButtonPopup(GetMythMainWindow(),
--                                             QString(""),
--                                             QObject::tr("Couldn't find the old config file, proceed with update?"),
--                                             QObject::tr("No"), QObject::tr("Yes"), kDialogCodeButton1);
--                    if ( returncode == kDialogCodeButton1 )
-+                    Q3TextStream t( &file );        // use a text stream
-+                    while ( !t.eof() )
-                     {
--                        runNextSetting = ask_validate_network();
--                    }
--                    else if ( returncode == kDialogCodeButton0 )
--                    {
--                        runNextSetting = 1;
-+                        line = t.readLine();
-+                        if ( line.contains("8.") )
-+                        {
-+                            tflag = 1;
-+                        }
-                     }
-+                    file.close();
-                 }
--
-+            }
-+            if ( tflag == 0 )
-+            {
-+                //popup install doesn't look like R8
-+                MythPopupBox::showOkPopup(
-+                    GetMythMainWindow(),
-+                    QObject::tr(""),
-+                    QObject::tr("The selected disk cannot be upgraded because it is older than LinHES R8.0."));
-+                runNextSetting = 1;
-             }
-         }
-     }