summaryrefslogtreecommitdiff
path: root/source/kde/kdeadmin/knetworkconf.diff
blob: 425499d18542fe37c9f2a855b27334ee7a1ad82e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
--- ./knetworkconf/backends/platform.pl.cmake.orig	2010-07-06 01:54:42.000000000 -0500
+++ ./knetworkconf/backends/platform.pl.cmake	2011-03-13 16:43:44.000000000 -0500
@@ -93,6 +93,10 @@
   "slackware-9.1.0" => "Slackware 9.1.0",
   "slackware-10.0.0" => "Slackware 10.0.0",
   "slackware-10.1.0" => "Slackware 10.1.0",
+  "slackware-12.2.0" => "Slackware 12.2.0",
+  "slackware-13.0.0.0.0" => "Slackware 13.0.0.0.0",
+  "slackware-13.1.0" => "Slackware 13.1.0",
+  "slackware-13.37.0" => "Slackware 13.37.0",
   "freebsd-4"       => "FreeBSD 4",
   "freebsd-5"       => "FreeBSD 5",
   "freebsd-6"       => "FreeBSD 6",
--- ./knetworkconf/backends/network-conf.cmake.orig	2010-07-06 01:54:42.000000000 -0500
+++ ./knetworkconf/backends/network-conf.cmake	2011-03-13 16:43:13.000000000 -0500
@@ -77,7 +77,9 @@
               "mandriva-2006.1", "mandriva-2007.0", "mandriva-2007.1", "mandriva-2008.0", "mandriva-2008.1",
 	      "mandriva-2009.0", "mandriva-2009.1", "mandriva-2010.0",
               "vine-3.0", "vine-3.1",
-              "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0",
+              "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-12.2.0", "slackware-13.0.0.0.0",
+              "slackware-13.1.0",
+              "slackware-13.37.0",
 	      "freebsd-5", "freebsd-6", "freebsd-7", "freebsd-8", "freebsd-9",
               "gentoo", "vlos-1.2", "ark");
 
--- ./knetworkconf/backends/service.pl.cmake.orig	2010-07-06 01:54:42.000000000 -0500
+++ ./knetworkconf/backends/service.pl.cmake	2011-03-13 16:42:51.000000000 -0500
@@ -281,6 +281,10 @@
      "slackware-9.1.0" => "slackware-9.1.0",
      "slackware-10.0.0" => "slackware-9.1.0",
      "slackware-10.1.0" => "slackware-9.1.0",
+     "slackware-12.2.0" => "slackware-9.1.0",
+     "slackware-13.0.0.0.0" => "slackware-9.1.0",
+     "slackware-13.1.0" => "slackware-9.1.0",
+     "slackware-13.37.0" => "slackware-9.1.0",
 
      "gentoo"         => "gentoo",
      "vlos-1.2"       => "gentoo",
@@ -317,7 +321,11 @@
                       "nonetwork" => "RECOVER"
                      },
      "freebsd-5"  => {"rc" => "GRAPHICAL" },
-     "slackware-9.1.0" => {"4" => "GRAPHICAL" }
+     "slackware-9.1.0" => {"0" => "HALT",
+                           "3" => "NONE",
+                           "4" => "GRAPHICAL",
+                           "6" => "REBOOT"
+                          }
     );
 
   $distro = $dist_map{$gst_dist};
--- ./knetworkconf/backends/network.pl.cmake.orig	2010-07-06 01:54:42.000000000 -0500
+++ ./knetworkconf/backends/network.pl.cmake	2011-03-13 16:42:24.000000000 -0500
@@ -528,6 +528,10 @@
        "slackware-9.1.0" => "redhat-6.2",
        "slackware-10.0.0" => "redhat-6.2",
        "slackware-10.1.0" => "redhat-6.2",
+       "slackware-12.2.0" => "redhat-6.2",
+       "slackware-13.0.0.0.0" => "redhat-6.2",
+       "slackware-13.1.0" => "redhat-6.2",
+       "slackware-13.37.0" => "redhat-6.2",
        "gentoo"       => "debian-2.2",
        "vlos-1.2"     => "debian-2.2",
        "freebsd-5"    => "debian-2.2",
@@ -1833,6 +1837,10 @@
 	  "slackware-9.1.0" => \&gst_network_deb22_get_file,
 	  "slackware-10.0.0" => \&gst_network_deb22_get_file,
 	  "slackware-10.1.0" => \&gst_network_deb22_get_file,
+	  "slackware-12.2.0" => \&gst_network_deb22_get_file,
+	  "slackware-13.0.0.0.0" => \&gst_network_deb22_get_file,
+	  "slackware-13.1.0" => \&gst_network_deb22_get_file,
+	  "slackware-13.37.0" => \&gst_network_deb22_get_file,
 	  "gentoo"       => \&gst_network_deb22_get_file,
 	  "freebsd-5"    => \&gst_network_deb22_get_file,
 	  "freebsd-6"    => \&gst_network_deb22_get_file,
@@ -3958,6 +3966,10 @@
 	  "slackware-9.1.0" => "",
 	  "slackware-10.0.0" => "",
 	  "slackware-10.1.0" => "",
+	  "slackware-12.2.0" => "",
+	  "slackware-13.0.0.0.0" => "",
+	  "slackware-13.1.0" => "",
+	  "slackware-13.37.0" => "",
 	  "gentoo"       => "",
 	  "vlos-1.2"     => "",
 	  "freebsd-5"    => "",
@@ -4109,6 +4121,10 @@
 	  "slackware-9.1.0" => "slackware-9.1.0",
 	  "slackware-10.0.0" => "slackware-9.1.0",
 	  "slackware-10.1.0" => "slackware-9.1.0",
+	  "slackware-12.2.0" => "slackware-9.1.0",
+	  "slackware-13.0.0.0.0" => "slackware-9.1.0",
+	  "slackware-13.1.0" => "slackware-9.1.0",
+	  "slackware-13.37.0" => "slackware-9.1.0",
 	  "gentoo"       => "gentoo",
 	  "vlos-1.2"     => "vlos-1.2",
 	  "freebsd-5"    => "freebsd-5",
@@ -4395,6 +4411,7 @@
        [ "hostname",      \&gst_parse_fq_hostname, HOSTNAME ],
        [ "nameserver",    \&gst_parse_split_all_unique_hash_comment, RESOLV_CONF,  "nameserver", "[ \t]+" ],
        [ "searchdomain",  \&gst_parse_split_first_array_unique, RESOLV_CONF,  "search", "[ \t]+", "[ \t]+" ],
+       [ "domain",        \&gst_parse_fq_domain,   HOSTNAME ],
        [ "domain",        \&gst_parse_split_first_str,   RESOLV_CONF,  "domain", "[ \t]+" ],
        [ "order",         \&gst_parse_split_first_array, HOST_CONF,    "order", "[ \t]+", ",[ \t]*" ],
        [ "hostmatch",     \&gst_parse_split_first_bool,  HOST_CONF,    "multi", "[ \t]+" ],
@@ -4611,6 +4628,10 @@
 	  "slackware-9.1.0" => "slackware-9.1.0",
 	  "slackware-10.0.0" => "slackware-9.1.0",
 	  "slackware-10.1.0" => "slackware-9.1.0",
+	  "slackware-12.2.0" => "slackware-9.1.0",
+	  "slackware-13.0.0.0.0" => "slackware-9.1.0",
+	  "slackware-13.1.0" => "slackware-9.1.0",
+	  "slackware-13.37.0" => "slackware-9.1.0",
 	  "gentoo"       => "gentoo",
 	  "vlos-1.2"     => "vlos-1.2",
 	  "freebsd-5"    => "freebsd-5",
@@ -5508,6 +5529,10 @@
 	  "slackware-9.1.0" => "slackware-9.1.0",
 	  "slackware-10.0.0" => "slackware-9.1.0",
 	  "slackware-10.1.0" => "slackware-9.1.0",
+	  "slackware-12.2.0" => "slackware-9.1.0",
+	  "slackware-13.0.0.0.0" => "slackware-9.1.0",
+	  "slackware-13.1.0" => "slackware-9.1.0",
+	  "slackware-13.37.0" => "slackware-9.1.0",
 	  "gentoo"       => "gentoo",
 	  "vlos-1.2"     => "vlos-1.2",
 	  "freebsd-5"    => "freebsd-5",
@@ -5781,6 +5806,7 @@
        [ "hostname",      \&gst_replace_fq_hostname, HOSTNAME, "%hostname%", "%domain%" ],
        [ "hostname",      \&gst_network_run_hostname ],
        [ "gateway",       \&gst_replace_rcinet1conf_global, RC_INET_CONF, GATEWAY ],
+       [ "domain",        \&gst_parse_fq_domain,   HOSTNAME ],
        [ "domain",        \&gst_replace_join_first_str,   RESOLV_CONF, "domain", "[ \t]+" ],
        [ "nameserver",    \&gst_replace_join_all,         RESOLV_CONF, "nameserver", "[ \t]+" ],
        [ "searchdomain",  \&gst_replace_join_first_array, RESOLV_CONF, "search", "[ \t]+", "[ \t]+" ],
@@ -5960,6 +5986,10 @@
 	  "slackware-9.1.0" => "slackware-9.1.0",
 	  "slackware-10.0.0" => "slackware-9.1.0",
 	  "slackware-10.1.0" => "slackware-9.1.0",
+	  "slackware-12.2.0" => "slackware-9.1.0",
+	  "slackware-13.0.0.0.0" => "slackware-9.1.0",
+	  "slackware-13.1.0" => "slackware-9.1.0",
+	  "slackware-13.37.0" => "slackware-9.1.0",
 	  "gentoo"       => "gentoo",
 	  "vlos-1.2"     => "vlos-1.2",
 	  "freebsd-5"    => "freebsd-5",