]> Frank Brehm's Git Trees - config/samara/etc.git/commitdiff
Current state
authorFrank Brehm <frank.brehm@profitbricks.com>
Thu, 1 Aug 2013 20:45:35 +0000 (22:45 +0200)
committerFrank Brehm <frank.brehm@profitbricks.com>
Thu, 1 Aug 2013 20:45:35 +0000 (22:45 +0200)
32 files changed:
config-archive/etc/pam.d/login [new file with mode: 0644]
config-archive/etc/pam.d/login.dist [new file with mode: 0644]
config-archive/etc/pam.d/passwd [new file with mode: 0644]
config-archive/etc/pam.d/passwd.dist [new file with mode: 0644]
config-archive/etc/pam.d/su [new file with mode: 0644]
config-archive/etc/pam.d/su.dist [new file with mode: 0644]
cups/client.conf
cups/cups-browsed.conf [new file with mode: 0644]
cups/cups-files.conf [new file with mode: 0644]
cups/cupsd.conf
cups/cupsd.conf.default [deleted file]
cups/printers.conf
cups/printers.conf.O
dbus-1/system.d/org.kde.polkitkde1.helper.conf [deleted file]
env.d/99polkit-kde [deleted file]
fonts/conf.avail/99pdftoopvp.conf [new file with mode: 0644]
gconf/gconf.xml.defaults/%gconf-tree.xml
gconf/schemas/virt-manager.schemas
init.d/cups-browsed [new file with mode: 0755]
init.d/cupsd
init.d/udev
login.defs
nanorc
pam.d/kde
pam.d/kde-np
pam.d/login
pam.d/newusers
pam.d/passwd
pam.d/su
pam.d/system-login
sandbox.conf
vim/vimrc.local

diff --git a/config-archive/etc/pam.d/login b/config-archive/etc/pam.d/login
new file mode 100644 (file)
index 0000000..13abd27
--- /dev/null
@@ -0,0 +1,6 @@
+auth       required    pam_securetty.so
+auth       include     system-local-login
+
+account    include     system-local-login
+password   include     system-local-login
+session    include     system-local-login
diff --git a/config-archive/etc/pam.d/login.dist b/config-archive/etc/pam.d/login.dist
new file mode 100644 (file)
index 0000000..787803d
--- /dev/null
@@ -0,0 +1,6 @@
+auth       required    pam_securetty.so
+auth       include     system-local-login
+account    include     system-local-login
+password   include     system-local-login
+session    optional pam_lastlog.so 
+session    include     system-local-login
diff --git a/config-archive/etc/pam.d/passwd b/config-archive/etc/pam.d/passwd
new file mode 100644 (file)
index 0000000..960b32e
--- /dev/null
@@ -0,0 +1,8 @@
+#%PAM-1.0
+
+auth       sufficient   pam_rootok.so
+auth       include     system-auth
+
+account    include     system-auth
+
+password   include     system-auth
diff --git a/config-archive/etc/pam.d/passwd.dist b/config-archive/etc/pam.d/passwd.dist
new file mode 100644 (file)
index 0000000..bcb5d2c
--- /dev/null
@@ -0,0 +1,4 @@
+auth       sufficient   pam_rootok.so
+auth       include     system-auth
+account    include     system-auth
+password   include     system-auth
diff --git a/config-archive/etc/pam.d/su b/config-archive/etc/pam.d/su
new file mode 100644 (file)
index 0000000..d15c7ed
--- /dev/null
@@ -0,0 +1,32 @@
+#%PAM-1.0
+
+auth       sufficient  pam_rootok.so
+
+# If you want to restrict users begin allowed to su even more,
+# create /etc/security/suauth.allow (or to that matter) that is only
+# writable by root, and add users that are allowed to su to that
+# file, one per line.
+#auth       required     pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow
+
+# Uncomment this to allow users in the wheel group to su without
+# entering a passwd.
+#auth       sufficient   pam_wheel.so use_uid trust
+
+# Alternatively to above, you can implement a list of users that do
+# not need to supply a passwd with a list.
+#auth       sufficient   pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass
+
+# Comment this to allow any user, even those not in the 'wheel'
+# group to su
+auth       required     pam_wheel.so use_uid
+
+auth       include             system-auth
+
+account    include             system-auth
+
+password   include             system-auth
+
+session    include             system-auth
+session    required     pam_env.so
+session    optional            pam_xauth.so
+
diff --git a/config-archive/etc/pam.d/su.dist b/config-archive/etc/pam.d/su.dist
new file mode 100644 (file)
index 0000000..30c2834
--- /dev/null
@@ -0,0 +1,8 @@
+auth       sufficient  pam_rootok.so
+auth       required     pam_wheel.so use_uid
+auth       include             system-auth
+account    include             system-auth
+password   include             system-auth
+session    include             system-auth
+session    required     pam_env.so
+session    optional            pam_xauth.so
index d6d639eac0377b3b2dd78aadb76d0e93cd19b724..34395d3657faae9d8a8affa7e8d591580eb68341 100644 (file)
@@ -1 +1 @@
-ServerName /var/run/cups/cups.sock
+ServerName /run/cups/cups.sock
diff --git a/cups/cups-browsed.conf b/cups/cups-browsed.conf
new file mode 100644 (file)
index 0000000..57d2deb
--- /dev/null
@@ -0,0 +1,26 @@
+# Which protocols will we use to discover printers on the network?
+# Can use DNSSD and/or CUPS, or 'none' for neither.
+BrowseRemoteProtocols DNSSD,CUPS
+
+# Which protocols will we use to broadcast shared local printers to the network?
+# Can use DNSSD and/or CUPS, or 'none' for neither.
+# Only CUPS is actually supported, as DNSSD is done by CUPS itself (we ignore
+# DNSSD in this directive).
+# BrowseLocalProtocols none
+
+# Settings of this directive apply to both BrowseRemoteProtocols and
+# BrowseLocalProtocols.
+# Can use DNSSD and/or CUPS, or 'none' for neither.
+# BrowseProtocols none
+
+# Only browse remote printers from selected servers
+# BrowseAllow cups.example.com
+# BrowseAllow 192.168.1.12
+# BrowseAllow 192.168.1.0/24
+# BrowseAllow 192.168.1.0/255.255.255.0
+
+# Use BrowsePoll to poll a particular CUPS server
+# BrowsePoll cups.example.com
+# BrowsePoll cups.example.com:631
+
+# Unknown directives are ignored, also unknown values.
diff --git a/cups/cups-files.conf b/cups/cups-files.conf
new file mode 100644 (file)
index 0000000..9edfd39
--- /dev/null
@@ -0,0 +1,98 @@
+#
+# "$Id: cups-files.conf.in 10765 2012-12-13 20:36:17Z mike $"
+#
+# Sample file/directory/user/group configuration file for the CUPS scheduler.
+# See "man cups-files.conf" for a complete description of this file.
+#
+
+# List of events that are considered fatal errors for the scheduler...
+#FatalErrors config
+
+# Default user and group for filters/backends/helper programs; this cannot be
+# any user or group that resolves to ID 0 for security reasons...
+#User lp
+#Group lp
+
+# Administrator user group, used to match @SYSTEM in cupsd.conf policy rules...
+SystemGroup lpadmin
+
+
+# User that is substituted for unauthenticated (remote) root accesses...
+#RemoteRoot remroot
+
+# Do we allow file: device URIs other than to /dev/null?
+#FileDevice No
+
+# Permissions for configuration and log files...
+#ConfigFilePerm 0640
+#LogFilePerm 0644
+
+# Location of the file logging all access to the scheduler; may be the name
+# "syslog". If not an absolute path, the value of ServerRoot is used as the
+# root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
+AccessLog /var/log/cups/access_log
+
+# Location of cache files used by the scheduler...
+#CacheDir /var/cache/cups
+
+# Location of data files used by the scheduler...
+#DataDir /usr/share/cups
+
+# Location of the static web content served by the scheduler...
+#DocumentRoot /usr/share/cups/html
+
+# Location of the file logging all messages produced by the scheduler and any
+# helper programs; may be the name "syslog". If not an absolute path, the value
+# of ServerRoot is used as the root directory.  Also see the "LogLevel"
+# directive in cupsd.conf.
+ErrorLog /var/log/cups/error_log
+
+# Location of fonts used by older print filters...
+#FontPath /usr/share/cups/fonts
+
+# Location of LPD configuration
+#LPDConfigFile 
+
+# Location of the file logging all pages printed by the scheduler and any
+# helper programs; may be the name "syslog". If not an absolute path, the value
+# of ServerRoot is used as the root directory.  Also see the "PageLogFormat"
+# directive in cupsd.conf.
+PageLog /var/log/cups/page_log
+
+# Location of the file listing all of the local printers...
+#Printcap /etc/printcap
+
+# Format of the Printcap file...
+#PrintcapFormat bsd
+#PrintcapFormat plist
+#PrintcapFormat solaris
+
+# Location of all spool files...
+#RequestRoot /var/spool/cups
+
+# Location of helper programs...
+#ServerBin /usr/lib/cups
+
+# SSL/TLS certificate for the scheduler...
+#ServerCertificate ssl/server.crt
+
+# SSL/TLS private key for the scheduler...
+#ServerKey ssl/server.key
+
+# Location of other configuration files...
+#ServerRoot /etc/cups
+
+# Location of Samba configuration file...
+#SMBConfigFile 
+
+# Location of scheduler state files...
+#StateDir /run/cups
+
+# Location of scheduler/helper temporary files. This directory is emptied on
+# scheduler startup and cannot be one of the standard (public) temporary
+# directory locations for security reasons...
+#TempDir /var/spool/cups/tmp
+
+#
+# End of "$Id: cups-files.conf.in 10765 2012-12-13 20:36:17Z mike $".
+#
index ea8c06130d763a08ad92e6aeb2def2be35bd757b..43b2eaecb515a193190dc710129f9e318f907fb3 100644 (file)
@@ -1,5 +1,5 @@
 #
-# "$Id: cupsd.conf.in 9407 2010-12-09 21:24:51Z mike $"
+# "$Id: cupsd.conf.in 10710 2012-11-26 18:26:01Z mike $"
 #
 # Sample configuration file for the CUPS scheduler.  See "man cupsd.conf" for a
 # complete description of this file.
@@ -9,20 +9,13 @@
 # for troubleshooting...
 LogLevel warn
 
-# Administrator user group...
-SystemGroup lpadmin
-
-
 # Only listen for connections from the local machine.
 Listen localhost:631
-Listen /var/run/cups/cups.sock
+Listen /run/cups/cups.sock
 
 # Show shared printers on the local network.
-# We switch this off by default in Gentoo, to avoid an unnecessary open port.
-Browsing Off
-BrowseOrder allow,deny
-BrowseAllow all
-BrowseLocalProtocols CUPS dnssd
+Browsing On
+BrowseLocalProtocols dnssd
 
 # Default authentication type, when authentication is required...
 DefaultAuthType Basic
@@ -137,5 +130,5 @@ WebInterface Yes
 </Policy>
 
 #
-# End of "$Id: cupsd.conf.in 9407 2010-12-09 21:24:51Z mike $".
+# End of "$Id: cupsd.conf.in 10710 2012-11-26 18:26:01Z mike $".
 #
diff --git a/cups/cupsd.conf.default b/cups/cupsd.conf.default
deleted file mode 100644 (file)
index ea8c061..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# "$Id: cupsd.conf.in 9407 2010-12-09 21:24:51Z mike $"
-#
-# Sample configuration file for the CUPS scheduler.  See "man cupsd.conf" for a
-# complete description of this file.
-#
-
-# Log general information in error_log - change "warn" to "debug"
-# for troubleshooting...
-LogLevel warn
-
-# Administrator user group...
-SystemGroup lpadmin
-
-
-# Only listen for connections from the local machine.
-Listen localhost:631
-Listen /var/run/cups/cups.sock
-
-# Show shared printers on the local network.
-# We switch this off by default in Gentoo, to avoid an unnecessary open port.
-Browsing Off
-BrowseOrder allow,deny
-BrowseAllow all
-BrowseLocalProtocols CUPS dnssd
-
-# Default authentication type, when authentication is required...
-DefaultAuthType Basic
-
-# Web interface setting...
-WebInterface Yes
-
-# Restrict access to the server...
-<Location />
-  Order allow,deny
-</Location>
-
-# Restrict access to the admin pages...
-<Location /admin>
-  Order allow,deny
-</Location>
-
-# Restrict access to configuration files...
-<Location /admin/conf>
-  AuthType Default
-  Require user @SYSTEM
-  Order allow,deny
-</Location>
-
-# Set the default printer/job policies...
-<Policy default>
-  # Job/subscription privacy...
-  JobPrivateAccess default
-  JobPrivateValues default
-  SubscriptionPrivateAccess default
-  SubscriptionPrivateValues default
-
-  # Job-related operations must be done by the owner or an administrator...
-  <Limit Create-Job Print-Job Print-URI Validate-Job>
-    Order deny,allow
-  </Limit>
-
-  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
-    Require user @OWNER @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # All administration operations require an administrator to authenticate...
-  <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default CUPS-Get-Devices>
-    AuthType Default
-    Require user @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # All printer operations require a printer operator to authenticate...
-  <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
-    AuthType Default
-    Require user @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # Only the owner or an administrator can cancel or authenticate a job...
-  <Limit Cancel-Job CUPS-Authenticate-Job>
-    Require user @OWNER @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  <Limit All>
-    Order deny,allow
-  </Limit>
-</Policy>
-
-# Set the authenticated printer/job policies...
-<Policy authenticated>
-  # Job/subscription privacy...
-  JobPrivateAccess default
-  JobPrivateValues default
-  SubscriptionPrivateAccess default
-  SubscriptionPrivateValues default
-
-  # Job-related operations must be done by the owner or an administrator...
-  <Limit Create-Job Print-Job Print-URI Validate-Job>
-    AuthType Default
-    Order deny,allow
-  </Limit>
-
-  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
-    AuthType Default
-    Require user @OWNER @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # All administration operations require an administrator to authenticate...
-  <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default>
-    AuthType Default
-    Require user @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # All printer operations require a printer operator to authenticate...
-  <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
-    AuthType Default
-    Require user @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # Only the owner or an administrator can cancel or authenticate a job...
-  <Limit Cancel-Job CUPS-Authenticate-Job>
-    AuthType Default
-    Require user @OWNER @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  <Limit All>
-    Order deny,allow
-  </Limit>
-</Policy>
-
-#
-# End of "$Id: cupsd.conf.in 9407 2010-12-09 21:24:51Z mike $".
-#
index 19a45b8770fa9f77f99354a17dd49db51a78aa49..a72c93fc837f2a6cafdf4c75bc870219fa3500a8 100644 (file)
@@ -1,5 +1,5 @@
-# Printer configuration file for CUPS v1.5.2
-# Written by cupsd on 2013-06-21 09:47
+# Printer configuration file for CUPS v1.6.2
+# Written by cupsd on 2013-07-08 15:15
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter Dell_2350dn_Laser_Printer>
 UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be
index 4e2d9380522c84f3aa5df2b92f5a70c74becaacd..19a45b8770fa9f77f99354a17dd49db51a78aa49 100644 (file)
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.5.2
-# Written by cupsd on 2013-06-21 09:46
+# 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 1371800794
+StateTime 1371800841
 Type 8433684
 Accepting Yes
 Shared No
@@ -22,5 +22,5 @@ Attribute marker-colors \#000000,none,none
 Attribute marker-levels 300,99,-1
 Attribute marker-names Black Toner,Fuser,Maintenance Kit
 Attribute marker-types toner,other,other
-Attribute marker-change-time 1371800813
+Attribute marker-change-time 1371800841
 </Printer>
diff --git a/dbus-1/system.d/org.kde.polkitkde1.helper.conf b/dbus-1/system.d/org.kde.polkitkde1.helper.conf
deleted file mode 100644 (file)
index baa69a9..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <!-- This configuration file specifies the required security policies
-       for polkit-kde to work. -->
-
-  <!-- Only user root can own the polkitkde1.helper service -->
-  <policy user="root">
-    <allow own="org.kde.polkitkde1.helper"/>
-  </policy>
-
-  <!-- Allow anyone to call into the service - we'll reject callers using polkit -->
-  <policy context="default">
-    <allow send_destination="org.kde.polkitkde1.helper"/>
-  </policy>
-
-</busconfig>
\ No newline at end of file
diff --git a/env.d/99polkit-kde b/env.d/99polkit-kde
deleted file mode 100644 (file)
index d6646ad..0000000
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PROTECT="/usr/share/polkit-1/actions"
diff --git a/fonts/conf.avail/99pdftoopvp.conf b/fonts/conf.avail/99pdftoopvp.conf
new file mode 100644 (file)
index 0000000..2737e17
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/pdftoopvp.fconf -->
+<fontconfig>
+<!--  Symbol and ZapfDingbats -->
+       <alias>
+               <family>ZapfDingbats</family>
+               <prefer>
+                       <family>Dingbats</family>
+               </prefer>
+       </alias>
+       <alias>
+               <family>Symbol</family>
+               <prefer>
+                       <family>Standard Symbols L</family>
+               </prefer>
+       </alias>
+</fontconfig>
index a1050be248e58181b1516fe6cc1232f249d86a1b..ee4be3ac20d13f977b6c57ea7a9f4e1f7a296f2a 100644 (file)
                        </dir>
                </dir>
                <dir name="virt-manager">
-                       <entry name="manager_window_width" mtime="1362871733" schema="/schemas/apps/virt-manager/manager_window_width"/>
-                       <entry name="manager_window_height" mtime="1362871733" schema="/schemas/apps/virt-manager/manager_window_height"/>
-                       <entry name="system-tray" mtime="1362871733" schema="/schemas/apps/virt-manager/system-tray"/>
+                       <entry name="manager_window_width" mtime="1372753308" schema="/schemas/apps/virt-manager/manager_window_width"/>
+                       <entry name="manager_window_height" mtime="1372753308" schema="/schemas/apps/virt-manager/manager_window_height"/>
+                       <entry name="system-tray" mtime="1372753308" schema="/schemas/apps/virt-manager/system-tray"/>
                        <dir name="confirm">
-                               <entry name="unapplied_dev" mtime="1362871733" schema="/schemas/apps/virt-manager/confirm/unapplied_dev"/>
-                               <entry name="interface_power" mtime="1362871733" schema="/schemas/apps/virt-manager/confirm/interface_power"/>
-                               <entry name="removedev" mtime="1362871733" schema="/schemas/apps/virt-manager/confirm/removedev"/>
-                               <entry name="pause" mtime="1362871733" schema="/schemas/apps/virt-manager/confirm/pause"/>
-                               <entry name="poweroff" mtime="1362871733" schema="/schemas/apps/virt-manager/confirm/poweroff"/>
-                               <entry name="forcepoweroff" mtime="1362871733" schema="/schemas/apps/virt-manager/confirm/forcepoweroff"/>
+                               <entry name="delete_storage" mtime="1372753308" schema="/schemas/apps/virt-manager/confirm/delete_storage"/>
+                               <entry name="unapplied_dev" mtime="1372753308" schema="/schemas/apps/virt-manager/confirm/unapplied_dev"/>
+                               <entry name="interface_power" mtime="1372753308" schema="/schemas/apps/virt-manager/confirm/interface_power"/>
+                               <entry name="removedev" mtime="1372753308" schema="/schemas/apps/virt-manager/confirm/removedev"/>
+                               <entry name="pause" mtime="1372753308" schema="/schemas/apps/virt-manager/confirm/pause"/>
+                               <entry name="poweroff" mtime="1372753308" schema="/schemas/apps/virt-manager/confirm/poweroff"/>
+                               <entry name="forcepoweroff" mtime="1372753308" schema="/schemas/apps/virt-manager/confirm/forcepoweroff"/>
                        </dir>
                        <dir name="paths">
-                               <entry name="default-screenshot-path" mtime="1362871733" schema="/schemas/apps/virt-manager/paths/default-screenshot-path"/>
-                               <entry name="default-restore-path" mtime="1362871733" schema="/schemas/apps/virt-manager/paths/default-restore-path"/>
-                               <entry name="default-save-path" mtime="1362871733" schema="/schemas/apps/virt-manager/paths/default-save-path"/>
-                               <entry name="default-media-path" mtime="1362871733" schema="/schemas/apps/virt-manager/paths/default-media-path"/>
-                               <entry name="default-image-path" mtime="1362871733" schema="/schemas/apps/virt-manager/paths/default-image-path"/>
+                               <entry name="default-screenshot-path" mtime="1372753308" schema="/schemas/apps/virt-manager/paths/default-screenshot-path"/>
+                               <entry name="default-restore-path" mtime="1372753308" schema="/schemas/apps/virt-manager/paths/default-restore-path"/>
+                               <entry name="default-save-path" mtime="1372753308" schema="/schemas/apps/virt-manager/paths/default-save-path"/>
+                               <entry name="default-media-path" mtime="1372753308" schema="/schemas/apps/virt-manager/paths/default-media-path"/>
+                               <entry name="default-image-path" mtime="1372753308" schema="/schemas/apps/virt-manager/paths/default-image-path"/>
                        </dir>
                        <dir name="new-vm">
-                               <entry name="storage-format" mtime="1362871733" schema="/schemas/apps/virt-manager/new-vm/storage-format"/>
-                               <entry name="graphics_type" mtime="1362871733" schema="/schemas/apps/virt-manager/new-vm/graphics_type"/>
-                               <entry name="remote-sound" mtime="1362871733" schema="/schemas/apps/virt-manager/new-vm/remote-sound"/>
-                               <entry name="local-sound" mtime="1362871733" schema="/schemas/apps/virt-manager/new-vm/local-sound"/>
+                               <entry name="storage-format" mtime="1372753308" schema="/schemas/apps/virt-manager/new-vm/storage-format"/>
+                               <entry name="graphics_type" mtime="1372753308" schema="/schemas/apps/virt-manager/new-vm/graphics_type"/>
+                               <entry name="remote-sound" mtime="1372753308" schema="/schemas/apps/virt-manager/new-vm/remote-sound"/>
+                               <entry name="local-sound" mtime="1372753308" schema="/schemas/apps/virt-manager/new-vm/local-sound"/>
                        </dir>
                        <dir name="details">
-                               <entry name="show-toolbar" mtime="1362871733" schema="/schemas/apps/virt-manager/details/show-toolbar"/>
+                               <entry name="show-toolbar" mtime="1372753308" schema="/schemas/apps/virt-manager/details/show-toolbar"/>
                        </dir>
                        <dir name="console">
-                               <entry name="scaling" mtime="1362871733" schema="/schemas/apps/virt-manager/console/scaling"/>
-                               <entry name="grab-notify" mtime="1362871733" schema="/schemas/apps/virt-manager/console/grab-notify"/>
-                               <entry name="enable-accels" mtime="1362871733" schema="/schemas/apps/virt-manager/console/enable-accels"/>
+                               <entry name="scaling" mtime="1372753308" schema="/schemas/apps/virt-manager/console/scaling"/>
+                               <entry name="grab-notify" mtime="1372753308" schema="/schemas/apps/virt-manager/console/grab-notify"/>
+                               <entry name="enable-accels" mtime="1372753308" schema="/schemas/apps/virt-manager/console/enable-accels"/>
                        </dir>
                        <dir name="urls">
-                               <entry name="url-list-length" mtime="1362871733" schema="/schemas/apps/virt-manager/urls/url-list-length"/>
+                               <entry name="url-list-length" mtime="1372753308" schema="/schemas/apps/virt-manager/urls/url-list-length"/>
                        </dir>
                        <dir name="stats">
-                               <entry name="enable-net-poll" mtime="1362871733" schema="/schemas/apps/virt-manager/stats/enable-net-poll"/>
-                               <entry name="enable-disk-poll" mtime="1362871733" schema="/schemas/apps/virt-manager/stats/enable-disk-poll"/>
-                               <entry name="history-length" mtime="1362871733" schema="/schemas/apps/virt-manager/stats/history-length"/>
-                               <entry name="update-interval" mtime="1362871733" schema="/schemas/apps/virt-manager/stats/update-interval"/>
+                               <entry name="enable-net-poll" mtime="1372753308" schema="/schemas/apps/virt-manager/stats/enable-net-poll"/>
+                               <entry name="enable-disk-poll" mtime="1372753308" schema="/schemas/apps/virt-manager/stats/enable-disk-poll"/>
+                               <entry name="history-length" mtime="1372753308" schema="/schemas/apps/virt-manager/stats/history-length"/>
+                               <entry name="update-interval" mtime="1372753308" schema="/schemas/apps/virt-manager/stats/update-interval"/>
                        </dir>
                        <dir name="vmlist-fields">
-                               <entry name="host_cpu_usage" mtime="1362871733" schema="/schemas/apps/virt-manager/vmlist-fields/host_cpu_usage"/>
-                               <entry name="cpu_usage" mtime="1362871733" schema="/schemas/apps/virt-manager/vmlist-fields/cpu_usage"/>
-                               <entry name="network_traffic" mtime="1362871733" schema="/schemas/apps/virt-manager/vmlist-fields/network_traffic"/>
-                               <entry name="disk_usage" mtime="1362871733" schema="/schemas/apps/virt-manager/vmlist-fields/disk_usage"/>
+                               <entry name="host_cpu_usage" mtime="1372753308" schema="/schemas/apps/virt-manager/vmlist-fields/host_cpu_usage"/>
+                               <entry name="cpu_usage" mtime="1372753308" schema="/schemas/apps/virt-manager/vmlist-fields/cpu_usage"/>
+                               <entry name="network_traffic" mtime="1372753308" schema="/schemas/apps/virt-manager/vmlist-fields/network_traffic"/>
+                               <entry name="disk_usage" mtime="1372753308" schema="/schemas/apps/virt-manager/vmlist-fields/disk_usage"/>
                        </dir>
                </dir>
                <dir name="panel">
@@ -12371,56 +12372,62 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                </dir>
                        </dir>
                        <dir name="virt-manager">
-                               <entry name="manager_window_width" mtime="1362871733" type="schema" stype="int" owner="virt-manager">
+                               <entry name="manager_window_width" mtime="1372753308" type="schema" stype="int" owner="virt-manager">
                                        <local_schema locale="C" short_desc="Default manager window width">
                                                <default type="int" value="0"/>
                                                <longdesc>Default manager window width</longdesc>
                                        </local_schema>
                                </entry>
-                               <entry name="manager_window_height" mtime="1362871733" type="schema" stype="int" owner="virt-manager">
+                               <entry name="manager_window_height" mtime="1372753308" type="schema" stype="int" owner="virt-manager">
                                        <local_schema locale="C" short_desc="Default manager window height">
                                                <default type="int" value="0"/>
                                                <longdesc>Default manager window height</longdesc>
                                        </local_schema>
                                </entry>
-                               <entry name="system-tray" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                               <entry name="system-tray" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                        <local_schema locale="C" short_desc="Show system tray icon">
                                                <default type="bool" value="false"/>
                                                <longdesc>Show system tray icon while app is running</longdesc>
                                        </local_schema>
                                </entry>
                                <dir name="confirm">
-                                       <entry name="unapplied_dev" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="delete_storage" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
+                                               <local_schema locale="C" short_desc="Confirm deleting storage">
+                                                       <default type="bool" value="true"/>
+                                                       <longdesc>Whether we require a confirmation on deleting storage</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="unapplied_dev" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Confirm about unapplied device changes">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether we ask the user to apply or discard unapplied device changes</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="interface_power" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="interface_power" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Confirm device interface start and stop">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether we require confirmation to start or stop a libvirt virtual interface</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="removedev" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="removedev" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Confirm device removal request">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether we require confirmation to remove a virtual device</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="pause" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="pause" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Confirm pause request">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether we require confirmation to pause a VM</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="poweroff" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="poweroff" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Confirm poweroff request">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether we require confirmation to poweroff/reboot a VM</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="forcepoweroff" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="forcepoweroff" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Confirm force poweroff request">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether we require confirmation to forcepoweroff a VM</longdesc>
@@ -12428,7 +12435,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="paths">
-                                       <entry name="default-screenshot-path" mtime="1362871733" type="schema" stype="string" owner="virt-manager">
+                                       <entry name="default-screenshot-path" mtime="1372753308" type="schema" stype="string" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Default screenshot path">
                                                        <default type="string">
                                                                <stringvalue></stringvalue>
@@ -12436,7 +12443,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Default path for saving screenshots from VMs</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="default-restore-path" mtime="1362871733" type="schema" stype="string" owner="virt-manager">
+                                       <entry name="default-restore-path" mtime="1372753308" type="schema" stype="string" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Default restore path">
                                                        <default type="string">
                                                                <stringvalue></stringvalue>
@@ -12444,7 +12451,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Default path for stored VM snapshots</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="default-save-path" mtime="1362871733" type="schema" stype="string" owner="virt-manager">
+                                       <entry name="default-save-path" mtime="1372753308" type="schema" stype="string" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Default save domain path">
                                                        <default type="string">
                                                                <stringvalue></stringvalue>
@@ -12452,7 +12459,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Default path for saving VM snapshots</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="default-media-path" mtime="1362871733" type="schema" stype="string" owner="virt-manager">
+                                       <entry name="default-media-path" mtime="1372753308" type="schema" stype="string" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Default media path">
                                                        <default type="string">
                                                                <stringvalue></stringvalue>
@@ -12460,7 +12467,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Default path for choosing media</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="default-image-path" mtime="1362871733" type="schema" stype="string" owner="virt-manager">
+                                       <entry name="default-image-path" mtime="1372753308" type="schema" stype="string" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Default image path">
                                                        <default type="string">
                                                                <stringvalue></stringvalue>
@@ -12470,7 +12477,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="new-vm">
-                                       <entry name="storage-format" mtime="1362871733" type="schema" stype="string" owner="virt-manager">
+                                       <entry name="storage-format" mtime="1372753308" type="schema" stype="string" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Use selected format for new VM storage">
                                                        <default type="string">
                                                                <stringvalue>default</stringvalue>
@@ -12478,7 +12485,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Use selected format when creating new disk images in new VM wizard</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="graphics_type" mtime="1362871733" type="schema" stype="string" owner="virt-manager">
+                                       <entry name="graphics_type" mtime="1372753308" type="schema" stype="string" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Install selected graphics type for new VM">
                                                        <default type="string">
                                                                <stringvalue>vnc</stringvalue>
@@ -12486,13 +12493,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Install selected graphics type for new VM. vnc or spice</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="remote-sound" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="remote-sound" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Install sound device for remote VM">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether to install a sound device for remote VMs or not</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="local-sound" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="local-sound" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Install sound device for local VM">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether to install a sound device for local VMs or not</longdesc>
@@ -12500,7 +12507,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="details">
-                                       <entry name="show-toolbar" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="show-toolbar" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Whether to show VM button toolbar in Details display">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether to show toolbar containing Virtual Machine action buttons (such as Run, Pause, Shutdown) in the details display</longdesc>
@@ -12508,19 +12515,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="console">
-                                       <entry name="scaling" mtime="1362871733" type="schema" stype="int" owner="virt-manager">
+                                       <entry name="scaling" mtime="1372753308" type="schema" stype="int" owner="virt-manager">
                                                <local_schema locale="C" short_desc="When to scale the VM graphical console">
                                                        <default type="int" value="1"/>
                                                        <longdesc>When to scale the VM graphical console. 0 = never, 1 = only when in full screen mode, 2 = Always</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="grab-notify" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="grab-notify" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Whether to show notification when grabbing mouse">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether to show the notification hint when grabbing the mouse in the console</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="enable-accels" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="enable-accels" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Enable menu accelerators in console window">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether to enable menu accelerators while connected to the guest graphical console.</longdesc>
@@ -12528,7 +12535,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="urls">
-                                       <entry name="url-list-length" mtime="1362871733" type="schema" stype="int" owner="virt-manager">
+                                       <entry name="url-list-length" mtime="1372753308" type="schema" stype="int" owner="virt-manager">
                                                <local_schema locale="C" short_desc="The length of the list of URLs">
                                                        <default type="int" value="10"/>
                                                        <longdesc>The number of urls to keep in the history for the install media address page.</longdesc>
@@ -12536,25 +12543,25 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="stats">
-                                       <entry name="enable-net-poll" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="enable-net-poll" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Poll net i/o stats">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether or not the app will poll VM network i/o statistics</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="enable-disk-poll" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="enable-disk-poll" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Poll disk i/o stats">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether or not the app will poll VM disk i/o statistics</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="history-length" mtime="1362871733" type="schema" stype="int" owner="virt-manager">
+                                       <entry name="history-length" mtime="1372753308" type="schema" stype="int" owner="virt-manager">
                                                <local_schema locale="C" short_desc="The statistics history length">
                                                        <default type="int" value="120"/>
                                                        <longdesc>The number of samples to keep in the statistics history</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="update-interval" mtime="1362871733" type="schema" stype="int" owner="virt-manager">
+                                       <entry name="update-interval" mtime="1372753308" type="schema" stype="int" owner="virt-manager">
                                                <local_schema locale="C" short_desc="The statistics update interval">
                                                        <default type="int" value="1"/>
                                                        <longdesc>The statistics update interval in seconds</longdesc>
@@ -12562,25 +12569,25 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="vmlist-fields">
-                                       <entry name="host_cpu_usage" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="host_cpu_usage" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Show host cpu usage in summary">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Show the host cpu usage field in the domain list summary view</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="cpu_usage" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="cpu_usage" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Show guest cpu usage in summary">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Show the guest cpu usage field in the domain list summary view</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="network_traffic" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="network_traffic" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Show network I/O in summary">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Show the network I/O field in the domain list summary view</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="disk_usage" mtime="1362871733" type="schema" stype="bool" owner="virt-manager">
+                                       <entry name="disk_usage" mtime="1372753308" type="schema" stype="bool" owner="virt-manager">
                                                <local_schema locale="C" short_desc="Show disk I/O in summary">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Show the disk I/O field in the domain list summary view</longdesc>
@@ -16857,13 +16864,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -16873,13 +16878,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -16889,13 +16892,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18593,13 +18594,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18609,13 +18608,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18625,13 +18622,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18641,13 +18636,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18657,13 +18650,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18673,13 +18664,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18689,13 +18678,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18705,13 +18692,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18721,13 +18706,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18737,13 +18720,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18753,13 +18734,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18769,13 +18748,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18785,13 +18762,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18801,13 +18776,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18817,13 +18790,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18833,13 +18804,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18849,13 +18818,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
@@ -18865,13 +18832,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <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>
index 53a7caef54454535fa77ec1798d570f061ac2be1..1a69dfa5283e508b5c589c9fa1a18607a5918079 100644 (file)
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/virt-manager/confirm/delete_storage</key>
+      <applyto>/apps/virt-manager/confirm/delete_storage</applyto>
+      <owner>virt-manager</owner>
+      <type>bool</type>
+      <default>1</default>
+
+      <locale name="C">
+        <short>Confirm deleting storage</short>
+        <long>Whether we require a confirmation on deleting storage</long>
+      </locale>
+    </schema>
+
     <schema>
       <key>/schemas/apps/virt-manager/manager_window_height</key>
       <applyto>/apps/virt-manager/manager_window_height</applyto>
diff --git a/init.d/cups-browsed b/init.d/cups-browsed
new file mode 100755 (executable)
index 0000000..785c13a
--- /dev/null
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+
+PIDFILE=/var/run/cups-browsed.pid
+
+depend() {
+       need cupsd avahi-daemon
+}
+
+start() {
+       ebegin "Starting cups-browsed"
+       start-stop-daemon --start --make-pidfile --pidfile "${PIDFILE}" \
+               --background --quiet --exec /usr/sbin/cups-browsed
+       eend $?
+}
+
+stop() {
+       ebegin "Stopping cups-browsed"
+       start-stop-daemon --stop --pidfile "${PIDFILE}" --quiet --exec /usr/sbin/cupsd
+       eend $?
+}
index 7ccc3595c3a750422acbf9c0d5b0b9e8a2929874..9edc253ef9d362e38954f24f98195c7ca1b36559 100755 (executable)
@@ -9,8 +9,8 @@ depend() {
 
 start() {
        ebegin "Starting cupsd"
-       checkpath -q -d -m 0755 -o root:lp /var/run/cups
-       checkpath -q -d -m 0511 -o lp:lpadmin /var/run/cups/certs
+       checkpath -q -d -m 0755 -o root:lp /run/cups
+       checkpath -q -d -m 0511 -o lp:lpadmin /run/cups/certs
        start-stop-daemon --start --quiet --exec /usr/sbin/cupsd
        eend $?
 }
index 8f07d8f129c7cd4e91fc4621a22ce79e0da3af7d..0e9abfebd93dbf63505f1f055b47c724bf1f9fd9 100755 (executable)
@@ -90,7 +90,7 @@ start_udevmonitor()
        einfo "udev: Running udevadm monitor ${udev_monitor_opts} to log all events"
        start-stop-daemon --start --stdout "${udevmonitor_log}" \
                --make-pidfile --pidfile "${udevmonitor_pid}" \
-               --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts}
+               --background --exec /bin/udevadm -- monitor ${udev_monitor_opts}
 }
 
 populate_dev()
@@ -105,6 +105,7 @@ populate_dev()
        if ! yesno ${rc_coldplug:-${RC_COLDPLUG:-yes}}; then
                einfo "Setting /dev permissions and symbolic links"
                udevadm trigger --attr-match=dev --action=add
+               udevadm trigger --subsystem-match=net --action=add
                ewarn "Skipping udev coldplug sequence"
                return 0
        fi
@@ -128,7 +129,7 @@ stop_udevmonitor()
                ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}"
        else
                einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}"
-               start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm
+               start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /bin/udevadm
        fi
 }
 
index e99404ced5dbc55dae0dc1399b7c67f1a826b0c1..d0bf19d64a54621f86f5a5889b764069b865e56d 100644 (file)
@@ -1,7 +1,7 @@
 #
 # /etc/login.defs - Configuration control definitions for the shadow package.
 #
-#      $Id: login.defs 3038 2009-07-23 20:41:35Z nekral-guest $
+#      $Id: login.defs 3189 2010-03-26 11:53:06Z nekral-guest $
 #
 
 #
@@ -183,7 +183,8 @@ ERASECHAR   0177
 KILLCHAR       025
 #ULIMIT                2097152
 
-# Default initial "umask" value for non-PAM enabled systems.
+# Default initial "umask" value used by login on non-PAM enabled systems.
+# Default "umask" value for pam_umask on PAM enabled systems.
 # UMASK is also used by useradd and newusers to set the mode of new home
 # directories.
 # 022 is the default value, but 027, or even 077, could be considered
diff --git a/nanorc b/nanorc
index 746ccf29282ba2622f0eb2eb8ec21dc2d79a5e19..1124f9724e168ca0d62e8a871c0b30d18f749740 100644 (file)
--- a/nanorc
+++ b/nanorc
 ## Enable ~/.nano_history for saving and reading search/replace strings.
 # set historylog
 
+## Enable vim-style lock-files.  This is just to let a vim user know you
+## are editing a file [s]he is trying to edit and vice versa. There are
+## no plans to implement vim-style undo state in these files
+# set locking
+
 ## The opening and closing brackets that can be found by bracket
 ## searches.  They cannot contain blank characters.  The former set must
 ## come before the latter set, and both must be in the same order.
index 5dde13033b560c2a86a5679ada921c2f8988c2b6..24d19de0d3d8a677bf2a527964f58996170bec7f 100644 (file)
--- a/pam.d/kde
+++ b/pam.d/kde
@@ -1,10 +1,11 @@
 #%PAM-1.0
 
 auth       required     pam_nologin.so
-auth       include      system-auth
 
-account    include      system-auth
+auth       include      system-local-login
 
-password   include      system-auth
+account    include      system-local-login
 
-session    include      system-auth
+password   include      system-local-login
+
+session    include      system-local-login
index 5e4f50365a4a2bfdd933e36a6a63006f2a1c9aa6..f5499e6dc45f9b24e366d6db8933748c1ae057db 100644 (file)
@@ -3,8 +3,8 @@
 auth       required     pam_nologin.so
 auth      required     pam_permit.so
 
-account    include      system-auth
+account    include      system-local-login
 
-password   include      system-auth
+password   include      system-local-login
 
-session    include      system-auth
+session    include      system-local-login
index 13abd2796b4aeb910e41cdc9809fed50d874f39f..787803d269d537821a76d994193d0698674d5941 100644 (file)
@@ -1,6 +1,6 @@
 auth       required    pam_securetty.so
 auth       include     system-local-login
-
 account    include     system-local-login
 password   include     system-local-login
+session    optional pam_lastlog.so 
 session    include     system-local-login
index 743b2f0260d617be7c0e269fd068cc9b5b565b97..960b32eab3eb067df2e2c0f2bd9be78e40f09ca0 100644 (file)
@@ -1,8 +1,8 @@
-#%PAM-1.0 
+#%PAM-1.0
 
-auth       sufficient  pam_rootok.so
-auth       required            pam_permit.so
+auth       sufficient   pam_rootok.so
+auth       include     system-auth
 
-account    include             system-auth
+account    include     system-auth
 
-password   required            pam_permit.so
+password   include     system-auth
index 960b32eab3eb067df2e2c0f2bd9be78e40f09ca0..bcb5d2c0c06568e7a6d8a6cc19656c3741cfc339 100644 (file)
@@ -1,8 +1,4 @@
-#%PAM-1.0
-
 auth       sufficient   pam_rootok.so
 auth       include     system-auth
-
 account    include     system-auth
-
 password   include     system-auth
index d15c7edfc5d9f963f25288da0488ef173744c0ad..30c2834eac87998cb053edb948950b5ca696fa6e 100644 (file)
--- a/pam.d/su
+++ b/pam.d/su
@@ -1,32 +1,8 @@
-#%PAM-1.0
-
 auth       sufficient  pam_rootok.so
-
-# If you want to restrict users begin allowed to su even more,
-# create /etc/security/suauth.allow (or to that matter) that is only
-# writable by root, and add users that are allowed to su to that
-# file, one per line.
-#auth       required     pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow
-
-# Uncomment this to allow users in the wheel group to su without
-# entering a passwd.
-#auth       sufficient   pam_wheel.so use_uid trust
-
-# Alternatively to above, you can implement a list of users that do
-# not need to supply a passwd with a list.
-#auth       sufficient   pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass
-
-# Comment this to allow any user, even those not in the 'wheel'
-# group to su
 auth       required     pam_wheel.so use_uid
-
 auth       include             system-auth
-
 account    include             system-auth
-
 password   include             system-auth
-
 session    include             system-auth
 session    required     pam_env.so
 session    optional            pam_xauth.so
-
index 2345bb0fa8f0f51a383fbf2bfd24632ec7e6e6ef..f5861f020d87bd3c85fcf5c5b2e7d75281eb13d9 100644 (file)
@@ -14,9 +14,9 @@ password      optional        pam_gnome_keyring.so
  
 session         optional        pam_loginuid.so
 session                required        pam_env.so 
-session                optional        pam_lastlog.so 
+session                optional        pam_lastlog.so silent 
 session                include         system-auth
-session                optional        pam_ck_connector.so nox11
+-session       optional        pam_ck_connector.so nox11
 session                optional        pam_gnome_keyring.so auto_start
 session                optional        pam_motd.so motd=/etc/motd
 session                optional        pam_mail.so
index 6ad1c1570bd2adea9631731cf8ec2cbdf5d0413b..dc460f0154508416c6987c78e912c7df728c3779 100644 (file)
 #  operations caught by sandbox.  Default is "no"
 #SANDBOX_DEBUG="no"
 
-# SANDBOX_BEEP
-#
-#  The amount of beeps sandbox will issue when it exits with access violations
-#  after printing the normal log.  Default is "3"
-#SANDBOX_BEEP=3
-
 # NOCOLOR
 #
 #  Determine the use of color in the output.  Default is "false" (ie, use color)
index 9ddb9e1569a030dc2c903ccfe14c06bd944c6acd..6278ad906db914301ad7f1bff1a3c1ebd3454711 100644 (file)
@@ -6,6 +6,8 @@ set modeline
 set showmatch
 set ignorecase
 
+set list listchars=tab:»·,trail:·
+
 if has("multi_byte")
        set encoding=utf-8
        setglobal fileencoding=utf-8