]> Frank Brehm's Git Trees - config/samara/etc.git/commitdiff
Current state
authorFrank Brehm <frank.brehm@profitbricks.com>
Fri, 28 Jun 2013 13:34:45 +0000 (15:34 +0200)
committerFrank Brehm <frank.brehm@profitbricks.com>
Fri, 28 Jun 2013 13:34:45 +0000 (15:34 +0200)
12 files changed:
cups/printers.conf
cups/printers.conf.O
cups/subscriptions.conf
cups/subscriptions.conf.O
drirc
gconf/gconf.xml.defaults/%gconf-tree.xml
gconf/schemas/ufraw.schemas
init.d/libvirtd
libvirt/lxc.conf [deleted file]
libvirt/qemu-lockd.conf [new file with mode: 0644]
libvirt/qemu.conf [new file with mode: 0644]
revdep-rebuild/61-icedtea-bin-6

index f543db8513f93410598ecb7eff13ee546022826f..19a45b8770fa9f77f99354a17dd49db51a78aa49 100644 (file)
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.5.2
-# Written by cupsd on 2013-05-22 13:05
+# Written by cupsd on 2013-06-21 09:47
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter Dell_2350dn_Laser_Printer>
 UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be
@@ -8,7 +8,7 @@ Location Office RI
 MakeModel Dell S2500 Foomatic/Postscript (recommended)
 DeviceURI socket://192.168.49.5
 State Idle
-StateTime 1369220699
+StateTime 1371800841
 Type 8433684
 Accepting Yes
 Shared No
@@ -19,8 +19,8 @@ KLimit 0
 OpPolicy default
 ErrorPolicy stop-printer
 Attribute marker-colors \#000000,none,none
-Attribute marker-levels 10,99,-1
+Attribute marker-levels 300,99,-1
 Attribute marker-names Black Toner,Fuser,Maintenance Kit
 Attribute marker-types toner,other,other
-Attribute marker-change-time 1369220699
+Attribute marker-change-time 1371800841
 </Printer>
index e5f925d82832d787c688ac4de48685942e69994e..4e2d9380522c84f3aa5df2b92f5a70c74becaacd 100644 (file)
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.5.2
-# Written by cupsd on 2013-05-22 13:03
+# Written by cupsd on 2013-06-21 09:46
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter Dell_2350dn_Laser_Printer>
 UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be
@@ -8,7 +8,7 @@ Location Office RI
 MakeModel Dell S2500 Foomatic/Postscript (recommended)
 DeviceURI socket://192.168.49.5
 State Idle
-StateTime 1369220558
+StateTime 1371800794
 Type 8433684
 Accepting Yes
 Shared No
@@ -19,8 +19,8 @@ KLimit 0
 OpPolicy default
 ErrorPolicy stop-printer
 Attribute marker-colors \#000000,none,none
-Attribute marker-levels 10,99,-1
+Attribute marker-levels 300,99,-1
 Attribute marker-names Black Toner,Fuser,Maintenance Kit
 Attribute marker-types toner,other,other
-Attribute marker-change-time 1369220558
+Attribute marker-change-time 1371800813
 </Printer>
index 097444218b807a116dba37eac5d045ce8cb629ec..c226271905454916ffee75a21bac6efc4b6f7404 100644 (file)
@@ -1,3 +1,3 @@
 # Subscription configuration file for CUPS v1.5.2
-# Written by cupsd on 2013-05-23 12:08
-NextSubscriptionId 11
+# Written by cupsd on 2013-06-22 09:45
+NextSubscriptionId 12
index 4656b3d8ddea952d201754a1dc2d9c0eb5d5a52c..cccba8bec94625ede79d622d5acec0e8e657c33c 100644 (file)
@@ -1,11 +1,11 @@
 # Subscription configuration file for CUPS v1.5.2
-# Written by cupsd on 2013-05-22 13:05
-NextSubscriptionId 11
-<Subscription 10>
+# Written by cupsd on 2013-06-21 09:47
+NextSubscriptionId 12
+<Subscription 11>
 Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
 Owner fbrehm
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1369303693
-NextEventId 72
+ExpirationTime 1371887100
+NextEventId 127
 </Subscription>
diff --git a/drirc b/drirc
index cf13cdb802096897896072a9808c1e4850013f87..a13941f681e7f7314998464e5df646d65203a937 100644 (file)
--- a/drirc
+++ b/drirc
@@ -22,5 +22,8 @@
         <application name="Unigine OilRush (64-bit)" executable="OilRush_x64">
             <option name="disable_blend_func_extended" value="true" />
        </application>
+        <application name="Savage 2" executable="savage2.bin">
+            <option name="disable_glsl_line_continuations" value="true" />
+        </application>
     </device>
 </driconf>
index 2e3ffec8ae17bd64ca223088ac123d42dcd1ef99..a1050be248e58181b1516fe6cc1232f249d86a1b 100644 (file)
@@ -16851,6 +16851,54 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Set to true to disable all external thumbnailer programs, independent on whether they are independently disabled/enabled.</longdesc>
                                                </local_schema>
                                        </entry>
+                                       <dir name="image@x-samsung-srw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                                       <local_schema locale="C" short_desc="">
+                                                               <default type="string">
+                                                                       <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
+                                                               </default>
+                                                               <longdesc></longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                                       <local_schema locale="C" short_desc="">
+                                                               <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
+                                       <dir name="image@x-panasonic-rw2">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                                       <local_schema locale="C" short_desc="">
+                                                               <default type="string">
+                                                                       <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
+                                                               </default>
+                                                               <longdesc></longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                                       <local_schema locale="C" short_desc="">
+                                                               <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
+                                       <dir name="image@x-nikon-nrw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
+                                                       <local_schema locale="C" short_desc="">
+                                                               <default type="string">
+                                                                       <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
+                                                               </default>
+                                                               <longdesc></longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
+                                                       <local_schema locale="C" short_desc="">
+                                                               <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                        <dir name="application@x-font-otf">
                                                <entry name="enable" mtime="1362858508" type="schema" stype="bool">
                                                        <local_schema locale="C" short_desc="Whether to thumbnail OpenType fonts">
@@ -18540,254 +18588,290 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sony-arw">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sony-sr2">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sony-srf">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sigma-x3f">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-pentax-pef">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-panasonic-raw">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-olympus-orf">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-nikon-nef">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-minolta-mrw">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-kdc">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-k25">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-dcr">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-fuji-raf">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-canon-cr2">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-canon-crw">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-adobe-dng">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-dcraw">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="application@x-ufraw">
-                                               <entry name="command" mtime="1362871086" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371048236" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362871086" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371048236" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -20462,6 +20546,18 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                        </dir>
                        <dir name="thumbnailers">
                                <entry name="disable_all" mtime="1362855473" schema="/schemas/desktop/gnome/thumbnailers/disable_all"/>
+                               <dir name="image@x-samsung-srw">
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/enable"/>
+                               </dir>
+                               <dir name="image@x-panasonic-rw2">
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/enable"/>
+                               </dir>
+                               <dir name="image@x-nikon-nrw">
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/enable"/>
+                               </dir>
                                <dir name="application@x-font-otf">
                                        <entry name="enable" mtime="1362858508" schema="/schemas/desktop/gnome/thumbnailers/application@x-font-otf/enable"/>
                                        <entry name="command" mtime="1362858508" schema="/schemas/desktop/gnome/thumbnailers/application@x-font-otf/command"/>
@@ -20935,76 +21031,76 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        <entry name="enable" mtime="1362855930" schema="/schemas/desktop/gnome/thumbnailers/image@vnd.djvu/enable"/>
                                </dir>
                                <dir name="image@x-sony-arw">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/enable"/>
                                </dir>
                                <dir name="image@x-sony-sr2">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/enable"/>
                                </dir>
                                <dir name="image@x-sony-srf">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/enable"/>
                                </dir>
                                <dir name="image@x-sigma-x3f">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/enable"/>
                                </dir>
                                <dir name="image@x-pentax-pef">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/enable"/>
                                </dir>
                                <dir name="image@x-panasonic-raw">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/enable"/>
                                </dir>
                                <dir name="image@x-olympus-orf">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/enable"/>
                                </dir>
                                <dir name="image@x-nikon-nef">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/enable"/>
                                </dir>
                                <dir name="image@x-minolta-mrw">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/enable"/>
                                </dir>
                                <dir name="image@x-kodak-kdc">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/enable"/>
                                </dir>
                                <dir name="image@x-kodak-k25">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/enable"/>
                                </dir>
                                <dir name="image@x-kodak-dcr">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/enable"/>
                                </dir>
                                <dir name="image@x-fuji-raf">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/enable"/>
                                </dir>
                                <dir name="image@x-canon-cr2">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/enable"/>
                                </dir>
                                <dir name="image@x-canon-crw">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/enable"/>
                                </dir>
                                <dir name="image@x-adobe-dng">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/enable"/>
                                </dir>
                                <dir name="image@x-dcraw">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/enable"/>
                                </dir>
                                <dir name="application@x-ufraw">
-                                       <entry name="command" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/command"/>
-                                       <entry name="enable" mtime="1362871086" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/enable"/>
+                                       <entry name="command" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/command"/>
+                                       <entry name="enable" mtime="1371048236" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/enable"/>
                                </dir>
                        </dir>
                        <dir name="interface">
index b3fa4807e413d9f7dfc6ed1e7ee987e713c814ac..40cf1a6395111361cf1994aab109fa0db1a98793 100644 (file)
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/enable</key>
+      <applyto>/desktop/gnome/thumbnailers/image@x-nikon-nrw/enable</applyto>
+      <owner>ufraw</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short></short>
+        <long></long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/command</key>
+      <applyto>/desktop/gnome/thumbnailers/image@x-nikon-nrw/command</applyto>
+      <owner>ufraw</owner>
+      <type>string</type>
+      <default>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</default>
+      <locale name="C">
+        <short></short>
+        <long></long>
+      </locale>
+    </schema>
+
     <schema>
       <key>/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/enable</key>
       <applyto>/desktop/gnome/thumbnailers/image@x-olympus-orf/enable</applyto>
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/enable</key>
+      <applyto>/desktop/gnome/thumbnailers/image@x-panasonic-rw2/enable</applyto>
+      <owner>ufraw</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short></short>
+        <long></long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/command</key>
+      <applyto>/desktop/gnome/thumbnailers/image@x-panasonic-rw2/command</applyto>
+      <owner>ufraw</owner>
+      <type>string</type>
+      <default>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</default>
+      <locale name="C">
+        <short></short>
+        <long></long>
+      </locale>
+    </schema>
+
     <schema>
       <key>/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/enable</key>
       <applyto>/desktop/gnome/thumbnailers/image@x-pentax-pef/enable</applyto>
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/enable</key>
+      <applyto>/desktop/gnome/thumbnailers/image@x-samsung-srw/enable</applyto>
+      <owner>ufraw</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short></short>
+        <long></long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/command</key>
+      <applyto>/desktop/gnome/thumbnailers/image@x-samsung-srw/command</applyto>
+      <owner>ufraw</owner>
+      <type>string</type>
+      <default>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</default>
+      <locale name="C">
+        <short></short>
+        <long></long>
+      </locale>
+    </schema>
+
    </schemalist>
 </gconfschemafile>
index 4d296bbac993958496c2b4a0744e2c4636b68913..f5fdceb41fe782326525026508bee054ffae7601 100755 (executable)
@@ -8,7 +8,7 @@ description_reload="Restarts the libvirt daemon without stopping your VMs"
 depend() {
        
     use avahi-daemon   dbus
-       after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig
+       after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig xenconsoled
 }
 
 libvirtd_virsh() {
diff --git a/libvirt/lxc.conf b/libvirt/lxc.conf
deleted file mode 100644 (file)
index 8df4601..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-# Master configuration file for the LXC driver.
-# All settings described here are optional - if omitted, sensible
-# defaults are used.
-
-# By default, log messages generated by the lxc controller go to the
-# container logfile. It is also possible to accumulate log messages
-# from all lxc controllers along with libvirtd's log outputs. In this
-# case, the lxc controller will honor either LIBVIRT_LOG_OUTPUTS or
-# log_outputs from libvirtd.conf.
-#
-# This is disabled by default, uncomment below to enable it.
-#
-#log_with_libvirtd = 1
-
-
-# The default security driver is SELinux. If SELinux is disabled
-# on the host, then the security driver will automatically disable
-# itself. If you wish to disable QEMU SELinux security driver while
-# leaving SELinux enabled for the host in general, then set this
-# to 'none' instead.
-#
-#security_driver = "selinux"
-
-# If set to non-zero, then the default security labeling
-# will make guests confined. If set to zero, then guests
-# will be unconfined by default. Defaults to 0.
-#security_default_confined = 1
-
-# If set to non-zero, then attempts to create unconfined
-# guests will be blocked. Defaults to 0.
-#security_require_confined = 1
diff --git a/libvirt/qemu-lockd.conf b/libvirt/qemu-lockd.conf
new file mode 100644 (file)
index 0000000..85edb91
--- /dev/null
@@ -0,0 +1,68 @@
+
+#
+# The default lockd behaviour is to acquire locks directly
+# against each configured disk file / block device. If the
+# application wishes to instead manually manage leases in
+# the guest XML, then this parameter can be disabled
+#
+#auto_disk_leases = 0
+
+#
+# Flag to determine whether we allow starting of guests
+# which do not have any <lease> elements defined in their
+# configuration.
+#
+# If 'auto_disk_leases' is disabled, this setting defaults
+# to enabled, otherwise it defaults to disabled.
+#
+#require_lease_for_disks = 1
+
+
+#
+# The default lockd behaviour is to use the "direct"
+# lockspace, where the locks are acquired against the
+# actual file paths associated with the <disk> devices.
+#
+# Setting a directory here causes lockd to use "indirect"
+# lockspace, where a hash of the <disk> file path is
+# used to create a file in the lockspace directory. The
+# locks are then held on these hash files instead.
+#
+# This can be useful if the file paths refer to block
+# devices which are shared, since /dev fcntl() locks
+# don't propagate across hosts. It is also useful if
+# the filesystem does not support fcntl() locks.
+#
+# Typically this directory would be located on a shared
+# filesystem visible to all hosts accessing the same
+# storage.
+#
+#file_lockspace_dir = "/var/lib/libvirt/lockd/files"
+
+
+#
+# When using LVM volumes that can be visible across
+# multiple, it is desirable to do locking based on
+# the unique UUID associated with each volume, instead
+# of their paths. Setting this path causes libvirt to
+# do UUID based locking for LVM.
+#
+# Typically this directory would be located on a shared
+# filesystem visible to all hosts accessing the same
+# storage.
+#
+#lvm_lockspace_dir = "/var/lib/libvirt/lockd/lvmvolumes"
+
+
+#
+# When using SCSI volumes that can be visible across
+# multiple, it is desirable to do locking based on
+# the unique UUID associated with each volume, instead
+# of their paths. Setting this path causes libvirt to
+# do UUID based locking for SCSI.
+#
+# Typically this directory would be located on a shared
+# filesystem visible to all hosts accessing the same
+# storage.
+#
+#scsi_lockspace_dir = "/var/lib/libvirt/lockd/scsivolumes"
diff --git a/libvirt/qemu.conf b/libvirt/qemu.conf
new file mode 100644 (file)
index 0000000..0f0a24c
--- /dev/null
@@ -0,0 +1,411 @@
+# Master configuration file for the QEMU driver.
+# All settings described here are optional - if omitted, sensible
+# defaults are used.
+
+# VNC is configured to listen on 127.0.0.1 by default.
+# To make it listen on all public interfaces, uncomment
+# this next option.
+#
+# NB, strong recommendation to enable TLS + x509 certificate
+# verification when allowing public access
+#
+#vnc_listen = "0.0.0.0"
+
+# Enable this option to have VNC served over an automatically created
+# unix socket. This prevents unprivileged access from users on the
+# host machine, though most VNC clients do not support it.
+#
+# This will only be enabled for VNC configurations that do not have
+# a hardcoded 'listen' or 'socket' value. This setting takes preference
+# over vnc_listen.
+#
+#vnc_auto_unix_socket = 1
+
+# Enable use of TLS encryption on the VNC server. This requires
+# a VNC client which supports the VeNCrypt protocol extension.
+# Examples include vinagre, virt-viewer, virt-manager and vencrypt
+# itself. UltraVNC, RealVNC, TightVNC do not support this
+#
+# It is necessary to setup CA and issue a server certificate
+# before enabling this.
+#
+#vnc_tls = 1
+
+
+# Use of TLS requires that x509 certificates be issued. The
+# default it to keep them in /etc/pki/libvirt-vnc. This directory
+# must contain
+#
+#  ca-cert.pem - the CA master certificate
+#  server-cert.pem - the server certificate signed with ca-cert.pem
+#  server-key.pem  - the server private key
+#
+# This option allows the certificate directory to be changed
+#
+#vnc_tls_x509_cert_dir = "/etc/pki/libvirt-vnc"
+
+
+# The default TLS configuration only uses certificates for the server
+# allowing the client to verify the server's identity and establish
+# an encrypted channel.
+#
+# It is possible to use x509 certificates for authentication too, by
+# issuing a x509 certificate to every client who needs to connect.
+#
+# Enabling this option will reject any client who does not have a
+# certificate signed by the CA in /etc/pki/libvirt-vnc/ca-cert.pem
+#
+#vnc_tls_x509_verify = 1
+
+
+# The default VNC password. Only 8 letters are significant for
+# VNC passwords. This parameter is only used if the per-domain
+# XML config does not already provide a password. To allow
+# access without passwords, leave this commented out. An empty
+# string will still enable passwords, but be rejected by QEMU,
+# effectively preventing any use of VNC. Obviously change this
+# example here before you set this.
+#
+#vnc_password = "XYZ12345"
+
+
+# Enable use of SASL encryption on the VNC server. This requires
+# a VNC client which supports the SASL protocol extension.
+# Examples include vinagre, virt-viewer and virt-manager
+# itself. UltraVNC, RealVNC, TightVNC do not support this
+#
+# It is necessary to configure /etc/sasl2/qemu.conf to choose
+# the desired SASL plugin (eg, GSSPI for Kerberos)
+#
+#vnc_sasl = 1
+
+
+# The default SASL configuration file is located in /etc/sasl2/
+# When running libvirtd unprivileged, it may be desirable to
+# override the configs in this location. Set this parameter to
+# point to the directory, and create a qemu.conf in that location
+#
+#vnc_sasl_dir = "/some/directory/sasl2"
+
+
+# QEMU implements an extension for providing audio over a VNC connection,
+# though if your VNC client does not support it, your only chance for getting
+# sound output is through regular audio backends. By default, libvirt will
+# disable all QEMU sound backends if using VNC, since they can cause
+# permissions issues. Enabling this option will make libvirtd honor the
+# QEMU_AUDIO_DRV environment variable when using VNC.
+#
+#vnc_allow_host_audio = 0
+
+
+
+# SPICE is configured to listen on 127.0.0.1 by default.
+# To make it listen on all public interfaces, uncomment
+# this next option.
+#
+# NB, strong recommendation to enable TLS + x509 certificate
+# verification when allowing public access
+#
+#spice_listen = "0.0.0.0"
+
+
+# Enable use of TLS encryption on the SPICE server.
+#
+# It is necessary to setup CA and issue a server certificate
+# before enabling this.
+#
+#spice_tls = 1
+
+
+# Use of TLS requires that x509 certificates be issued. The
+# default it to keep them in /etc/pki/libvirt-spice. This directory
+# must contain
+#
+#  ca-cert.pem - the CA master certificate
+#  server-cert.pem - the server certificate signed with ca-cert.pem
+#  server-key.pem  - the server private key
+#
+# This option allows the certificate directory to be changed.
+#
+#spice_tls_x509_cert_dir = "/etc/pki/libvirt-spice"
+
+
+# The default SPICE password. This parameter is only used if the
+# per-domain XML config does not already provide a password. To
+# allow access without passwords, leave this commented out. An
+# empty string will still enable passwords, but be rejected by
+# QEMU, effectively preventing any use of SPICE. Obviously change
+# this example here before you set this.
+#
+#spice_password = "XYZ12345"
+
+
+# Override the port for creating both VNC and SPICE sessions (min).
+# This defaults to 5900 and increases for consecutive sessions
+# or when ports are occupied, until it hits the maximum.
+#
+# Minimum must be greater than or equal to 5900 as lower number would
+# result into negative vnc display number.
+#
+# Maximum must be less than 65536, because higher numbers do not make
+# sense as a port number.
+#
+#remote_display_port_min = 5900
+#remote_display_port_max = 65535
+
+
+# The default security driver is SELinux. If SELinux is disabled
+# on the host, then the security driver will automatically disable
+# itself. If you wish to disable QEMU SELinux security driver while
+# leaving SELinux enabled for the host in general, then set this
+# to 'none' instead. It's also possible to use more than one security
+# driver at the same time, for this use a list of names separated by
+# comma and delimited by square brackets. For example:
+#
+#       security_driver = [ "selinux", "apparmor" ]
+#
+# Notes: The DAC security driver is always enabled; as a result, the
+# value of security_driver cannot contain "dac".  The value "none" is
+# a special value; security_driver can be set to that value in
+# isolation, but it cannot appear in a list of drivers.
+#
+#security_driver = "selinux"
+
+# If set to non-zero, then the default security labeling
+# will make guests confined. If set to zero, then guests
+# will be unconfined by default. Defaults to 1.
+#security_default_confined = 1
+
+# If set to non-zero, then attempts to create unconfined
+# guests will be blocked. Defaults to 0.
+#security_require_confined = 1
+
+# The user for QEMU processes run by the system instance. It can be
+# specified as a user name or as a user id. The qemu driver will try to
+# parse this value first as a name and then, if the name doesn't exist,
+# as a user id.
+#
+# Since a sequence of digits is a valid user name, a leading plus sign
+# can be used to ensure that a user id will not be interpreted as a user
+# name.
+#
+# Some examples of valid values are:
+#
+#       user = "qemu"   # A user named "qemu"
+#       user = "+0"     # Super user (uid=0)
+#       user = "100"    # A user named "100" or a user with uid=100
+#
+#user = "root"
+
+# The group for QEMU processes run by the system instance. It can be
+# specified in a similar way to user.
+#group = "root"
+
+# Whether libvirt should dynamically change file ownership
+# to match the configured user/group above. Defaults to 1.
+# Set to 0 to disable file ownership changes.
+#dynamic_ownership = 1
+
+
+# What cgroup controllers to make use of with QEMU guests
+#
+#  - 'cpu' - use for schedular tunables
+#  - 'devices' - use for device whitelisting
+#  - 'memory' - use for memory tunables
+#  - 'blkio' - use for block devices I/O tunables
+#  - 'cpuset' - use for CPUs and memory nodes
+#  - 'cpuacct' - use for CPUs statistics.
+#
+# NB, even if configured here, they won't be used unless
+# the administrator has mounted cgroups, e.g.:
+#
+#  mkdir /dev/cgroup
+#  mount -t cgroup -o devices,cpu,memory,blkio,cpuset none /dev/cgroup
+#
+# They can be mounted anywhere, and different controllers
+# can be mounted in different locations. libvirt will detect
+# where they are located.
+#
+#cgroup_controllers = [ "cpu", "devices", "memory", "blkio", "cpuset", "cpuacct" ]
+
+# This is the basic set of devices allowed / required by
+# all virtual machines.
+#
+# As well as this, any configured block backed disks,
+# all sound device, and all PTY devices are allowed.
+#
+# This will only need setting if newer QEMU suddenly
+# wants some device we don't already know about.
+#
+#cgroup_device_acl = [
+#    "/dev/null", "/dev/full", "/dev/zero",
+#    "/dev/random", "/dev/urandom",
+#    "/dev/ptmx", "/dev/kvm", "/dev/kqemu",
+#    "/dev/rtc","/dev/hpet", "/dev/vfio/vfio"
+#]
+
+
+# The default format for Qemu/KVM guest save images is raw; that is, the
+# memory from the domain is dumped out directly to a file.  If you have
+# guests with a large amount of memory, however, this can take up quite
+# a bit of space.  If you would like to compress the images while they
+# are being saved to disk, you can also set "lzop", "gzip", "bzip2", or "xz"
+# for save_image_format.  Note that this means you slow down the process of
+# saving a domain in order to save disk space; the list above is in descending
+# order by performance and ascending order by compression ratio.
+#
+# save_image_format is used when you use 'virsh save' at scheduled
+# saving, and it is an error if the specified save_image_format is
+# not valid, or the requested compression program can't be found.
+#
+# dump_image_format is used when you use 'virsh dump' at emergency
+# crashdump, and if the specified dump_image_format is not valid, or
+# the requested compression program can't be found, this falls
+# back to "raw" compression.
+#
+#save_image_format = "raw"
+#dump_image_format = "raw"
+
+# When a domain is configured to be auto-dumped when libvirtd receives a
+# watchdog event from qemu guest, libvirtd will save dump files in directory
+# specified by auto_dump_path. Default value is /var/lib/libvirt/qemu/dump
+#
+#auto_dump_path = "/var/lib/libvirt/qemu/dump"
+
+# When a domain is configured to be auto-dumped, enabling this flag
+# has the same effect as using the VIR_DUMP_BYPASS_CACHE flag with the
+# virDomainCoreDump API.  That is, the system will avoid using the
+# file system cache while writing the dump file, but may cause
+# slower operation.
+#
+#auto_dump_bypass_cache = 0
+
+# When a domain is configured to be auto-started, enabling this flag
+# has the same effect as using the VIR_DOMAIN_START_BYPASS_CACHE flag
+# with the virDomainCreateWithFlags API.  That is, the system will
+# avoid using the file system cache when restoring any managed state
+# file, but may cause slower operation.
+#
+#auto_start_bypass_cache = 0
+
+# If provided by the host and a hugetlbfs mount point is configured,
+# a guest may request huge page backing.  When this mount point is
+# unspecified here, determination of a host mount point in /proc/mounts
+# will be attempted.  Specifying an explicit mount overrides detection
+# of the same in /proc/mounts.  Setting the mount point to "" will
+# disable guest hugepage backing.
+#
+# NB, within this mount point, guests will create memory backing files
+# in a location of  $MOUNTPOINT/libvirt/qemu
+#
+#hugetlbfs_mount = "/dev/hugepages"
+
+
+# Path to the setuid helper for creating tap devices.  This executable
+# is used to create <source type='bridge'> interfaces when libvirtd is
+# running unprivileged.  libvirt invokes the helper directly, instead
+# of using "-netdev bridge", for security reasons.
+#bridge_helper = "/usr/libexec/qemu-bridge-helper"
+
+
+
+# If clear_emulator_capabilities is enabled, libvirt will drop all
+# privileged capabilities of the QEmu/KVM emulator. This is enabled by
+# default.
+#
+# Warning: Disabling this option means that a compromised guest can
+# exploit the privileges and possibly do damage to the host.
+#
+#clear_emulator_capabilities = 1
+
+
+# If enabled, libvirt will have QEMU set its process name to
+# "qemu:VM_NAME", where VM_NAME is the name of the VM. The QEMU
+# process will appear as "qemu:VM_NAME" in process listings and
+# other system monitoring tools. By default, QEMU does not set
+# its process title, so the complete QEMU command (emulator and
+# its arguments) appear in process listings.
+#
+#set_process_name = 1
+
+
+# If max_processes is set to a positive integer, libvirt will use
+# it to set the maximum number of processes that can be run by qemu
+# user. This can be used to override default value set by host OS.
+# The same applies to max_files which sets the limit on the maximum
+# number of opened files.
+#
+#max_processes = 0
+#max_files = 0
+
+
+
+# mac_filter enables MAC addressed based filtering on bridge ports.
+# This currently requires ebtables to be installed.
+#
+#mac_filter = 1
+
+
+# By default, PCI devices below non-ACS switch are not allowed to be assigned
+# to guests. By setting relaxed_acs_check to 1 such devices will be allowed to
+# be assigned to guests.
+#
+#relaxed_acs_check = 1
+
+
+# If allow_disk_format_probing is enabled, libvirt will probe disk
+# images to attempt to identify their format, when not otherwise
+# specified in the XML. This is disabled by default.
+#
+# WARNING: Enabling probing is a security hole in almost all
+# deployments. It is strongly recommended that users update their
+# guest XML <disk> elements to include  <driver type='XXXX'/>
+# elements instead of enabling this option.
+#
+#allow_disk_format_probing = 1
+
+
+# To enable 'Sanlock' project based locking of the file
+# content (to prevent two VMs writing to the same
+# disk), uncomment this
+#
+#lock_manager = "sanlock"
+
+
+
+# Set limit of maximum APIs queued on one domain. All other APIs
+# over this threshold will fail on acquiring job lock. Specially,
+# setting to zero turns this feature off.
+# Note, that job lock is per domain.
+#
+#max_queued = 0
+
+###################################################################
+# Keepalive protocol:
+# This allows qemu driver to detect broken connections to remote
+# libvirtd during peer-to-peer migration.  A keepalive message is
+# sent to the deamon after keepalive_interval seconds of inactivity
+# to check if the deamon is still responding; keepalive_count is a
+# maximum number of keepalive messages that are allowed to be sent
+# to the deamon without getting any response before the connection
+# is considered broken.  In other words, the connection is
+# automatically closed approximately after
+# keepalive_interval * (keepalive_count + 1) seconds since the last
+# message received from the deamon.  If keepalive_interval is set to
+# -1, qemu driver will not send keepalive requests during
+# peer-to-peer migration; however, the remote libvirtd can still
+# send them and source libvirtd will send responses.  When
+# keepalive_count is set to 0, connections will be automatically
+# closed after keepalive_interval seconds of inactivity without
+# sending any keepalive messages.
+#
+#keepalive_interval = 5
+#keepalive_count = 5
+
+
+
+# Use seccomp syscall whitelisting in QEMU.
+# 1 = on, 0 = off, -1 = use QEMU default
+# Defaults to -1.
+#
+#seccomp_sandbox = 1
index 9919480ef41bd0c9c8aadc1d4fc25fcf4ed1bd49..c0eed0bfb3c3f553fab91927152cbfdad770d38c 100644 (file)
@@ -1 +1 @@
-SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.12.4"
+SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.12.5"