summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2006-02-07 19:19:57 +0100
committerAurelien Foret <aurelien@archlinux.org>2006-02-07 19:19:57 +0100
commitbb121aa161e409c91b98dfba506d04460bead10c (patch)
tree267300ba2d8340a8ec622a8ff9e0adb5794194b6
parentb708e448ea3ab31cbdc67afbb086b1900452d66a (diff)
downloadpacman-bb121aa161e409c91b98dfba506d04460bead10c.tar.gz
pacman-bb121aa161e409c91b98dfba506d04460bead10c.tar.xz
pacman 2.9.8 synchro
-rw-r--r--etc/pacman.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/pacman.conf b/etc/pacman.conf
index 42578338..345eb8c1 100644
--- a/etc/pacman.conf
+++ b/etc/pacman.conf
@@ -19,10 +19,10 @@
[options]
LogFile = /var/log/pacman.log
NoUpgrade = etc/passwd etc/group etc/shadow etc/sudoers
-NoUpgrade = etc/fstab etc/raidtab etc/ld.so.conf
-NoUpgrade = etc/rc.conf etc/rc.local
+NoUpgrade = etc/fstab etc/raidtab etc/mdadm.conf etc/ld.so.conf
+NoUpgrade = etc/inittab etc/rc.conf etc/rc.local
NoUpgrade = etc/modprobe.conf etc/modules.conf
-NoUpgrade = etc/lilo.conf boot/grub/menu.lst
+NoUpgrade = etc/lilo.conf boot/grub/menu.lst etc/mkinitrd.conf
HoldPkg = pacman glibc
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u