diff options
author | Colin Guthrie <colin@mageia.org> | 2013-10-17 19:56:43 +0100 |
---|---|---|
committer | Colin Guthrie <colin@mageia.org> | 2013-10-18 09:35:39 +0100 |
commit | 9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3 (patch) | |
tree | 3a122662900195e7b14067a03cd5124358db9daf /rwtab | |
parent | 423b437e3d29673dfad4051515506e6d711d20e6 (diff) | |
parent | 8f5a82934f801ec94847fc899d235a39df9967a7 (diff) | |
download | initscripts-user/colin/update-to-9-50.tar initscripts-user/colin/update-to-9-50.tar.gz initscripts-user/colin/update-to-9-50.tar.bz2 initscripts-user/colin/update-to-9-50.tar.xz initscripts-user/colin/update-to-9-50.zip |
Merge tag 'initscripts-9.50-1' into distro/mgauser/colin/update-to-9-50
Tag as initscripts-9.50-1
Conflicts:
Makefile
lang.csh
lang.sh
po/Makefile
rc.d/init.d/network
service
sysconfig.txt
sysconfig/init
sysconfig/network-scripts/ifup
sysconfig/network-scripts/ifup-eth
sysconfig/network-scripts/ifup-ippp
sysconfig/network-scripts/network-functions
sysctl.conf
systemd/fedora-storage-init
Diffstat (limited to 'rwtab')
-rw-r--r-- | rwtab | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -2,43 +2,42 @@ dirs /var/cache/man dirs /var/gdm dirs /var/lib/xkb dirs /var/log -dirs /var/puppet +dirs /var/lib/puppet dirs /var/lib/dbus dirs /var/lib/nfs empty /tmp empty /var/cache/foomatic -empty /var/cache/hald empty /var/cache/logwatch -empty /var/cache/mod_ssl -empty /var/cache/mod_proxy +empty /var/cache/httpd/ssl +empty /var/cache/httpd/proxy empty /var/cache/php-pear empty /var/cache/systemtap empty /var/db/nscd empty /var/lib/dav -empty /var/lib/dhcp +empty /var/lib/dhcpd empty /var/lib/dhclient empty /var/lib/php empty /var/lib/pulse empty /var/lib/ups empty /var/tmp -empty /var/tux files /etc/adjtime files /etc/ntp.conf files /etc/resolv.conf -files /etc/lvm/.cache +files /etc/lvm/cache files /etc/lvm/archive files /etc/lvm/backup files /var/account -files /var/arpwatch +files /var/lib/arpwatch +files /var/lib/NetworkManager files /var/cache/alchemist files /var/lib/gdm files /var/lib/iscsi files /var/lib/logrotate.status files /var/lib/ntp files /var/lib/xen -files /var/lib/xend files /var/empty/sshd/etc/localtime files /var/lib/random-seed files /var/spool +files /var/lib/samba |