diff options
author | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-02 14:23:19 +0100 |
---|---|---|
committer | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-02 14:23:19 +0100 |
commit | ed2b6731ab373ac335fde87af177351facbd2f15 (patch) | |
tree | 81cc3d45c8c30aceadb4f597be819dc2863a3a3a /opensuse/core/tdebase/autorun.patch | |
parent | 021036598a306d8cf7204d6d62ff090278f7ecf1 (diff) | |
parent | 5f93960dbb108c2c6d09964d1ee0d2e390b1498c (diff) | |
download | tde-packaging-ed2b6731ab373ac335fde87af177351facbd2f15.tar.gz tde-packaging-ed2b6731ab373ac335fde87af177351facbd2f15.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'opensuse/core/tdebase/autorun.patch')
-rw-r--r-- | opensuse/core/tdebase/autorun.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/opensuse/core/tdebase/autorun.patch b/opensuse/core/tdebase/autorun.patch new file mode 100644 index 000000000..962740cdc --- /dev/null +++ b/opensuse/core/tdebase/autorun.patch @@ -0,0 +1,27 @@ +Index: kioslave/media/medianotifier/medianotifier.cpp +=================================================================== +--- kioslave/media/medianotifier/medianotifier.cpp.orig ++++ kioslave/media/medianotifier/medianotifier.cpp +@@ -133,7 +133,7 @@ bool MediaNotifier::autostart( const KFi + // be checked for the following Autostart files in order of precedence: + // .autorun, autorun, autorun.sh + QStringList autorun_list; +- autorun_list << ".autorun" << "autorun" << "autorun.sh"; ++ autorun_list << ".autorun" << "autorun" << "autorun.sh" << "setup.sh" << "media.1/patches"; + + QStringList::iterator it = autorun_list.begin(); + QStringList::iterator end = autorun_list.end(); +@@ -191,7 +191,12 @@ bool MediaNotifier::execAutorun( const K + // with the current working directory ( CWD ) set to the root + // directory of the medium. + KProcess proc; +- proc << "sh" << autorunFile; ++ if (autorunFile == "setup.sh") ++ proc << "kdesu" << autorunFile; ++ else if (autorunFile == "media.1/patches") ++ proc << "kdesu" << "--nonewdcop" << "/sbin/yast2" << "online_update" << ".cd_default"; ++ else ++ proc << "sh" << autorunFile; + proc.setWorkingDirectory( path ); + proc.start(); + proc.detach(); |