OSDN Git Service

kdm: adjust genkdmconf dirs lookup
authorIvailo Monev <xakepa10@gmail.com>
Wed, 20 May 2015 13:44:11 +0000 (13:44 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Wed, 20 May 2015 13:44:11 +0000 (13:44 +0000)
kdm/kfrontend/genkdmconf.c

index baf0388..265bbcf 100644 (file)
@@ -2930,21 +2930,14 @@ fprintfLineWrap(FILE *f, const char *msg, ...)
 
 static const char * const oldkdes[] = {
     KDE_CONFDIR,
-    "/opt/kde4/share/config",
-    "/usr/local/kde4/share/config",
-    "/local/kde4/share/config",
+    "/opt/katana/share/config",
+    "/usr/local/katana/share/config",
+    "/local/katana/share/config",
 
-    "/opt/kde/share/config",
-    "/usr/local/kde/share/config",
     "/usr/local/share/config",
     "/usr/share/config",
-    "/local/kde/share/config",
     "/local/share/config",
     "/share/config",
-
-    "/opt/kde3/share/config",
-    "/usr/local/kde3/share/config",
-    "/share/kde3/share/config",
 };
 
 static const char * const oldxdms[] = {
@@ -2986,7 +2979,7 @@ int main(int argc, char **argv)
 "  --old-kde /path/to/old/kde-config-dir\n"
 "    Where to look for the kdmrc of a previously installed kdm.\n"
 "    Default is to scan " KDE_CONFDIR " and\n"
-"    {/usr,/usr/local,{/opt,/usr/local}/{kde4,kde,kde3}}/share/config.\n"
+"    {/usr,/usr/local,{/opt,/usr/local}/katana}/share/config.\n"
 "  --no-old\n"
 "    Do not look at older xdm/kdm configurations, just create default config.\n"
 "  --no-old-xdm\n"