[Fai-commit] r6473 - in trunk: conf doc/includes

[Michael Tautschnig]

Author: mt
Date: 2011-04-16 09:44:16 +0000 (Sat, 16 Apr 2011)
New Revision: 6473

Modified:
   trunk/conf/NFSROOT
   trunk/doc/includes/faisetup.txt
Log:
conf/NFSROOT, doc/includes/faisetup.txt: drop deprecated aufs-modules-* package.


Merge of ceb4ce3 from 3.4 into trunk.
Also reverted r6468, r6470 as these became obsolete because of same package name
of kernel image.


Modified: trunk/conf/NFSROOT
===================================================================
--- trunk/conf/NFSROOT	2011-04-16 09:38:07 UTC (rev 6472)
+++ trunk/conf/NFSROOT	2011-04-16 09:44:16 UTC (rev 6473)
@@ -20,11 +20,6 @@
 grub lilo read-edid
 linux-image-486
 
-# packages for lenny:
-# linux-image-486 aufs-modules-2.6-486
-
 PACKAGES aptitude AMD64
 grub lilo
 linux-image-2.6-amd64
-# packages for lenny:
-# linux-image-2.6-amd64 aufs-modules-2.6-amd64

Modified: trunk/doc/includes/faisetup.txt
===================================================================
--- trunk/doc/includes/faisetup.txt	2011-04-16 09:38:07 UTC (rev 6472)
+++ trunk/doc/includes/faisetup.txt	2011-04-16 09:44:16 UTC (rev 6473)
@@ -11,7 +11,7 @@
 .
 Upgrading /srv/fai/nfsroot/live/filesystem.dir
 .
-nfs-common fai-nfsroot module-init-tools ssh rdate lshw portmap rsync lftp less dump reiserfsprogs e2fsprogs usbutils hwinfo psmisc pciutils hdparm smartmontools parted mdadm lvm2 dnsutils ntpdate dosfstools jove xfsprogs xfsdump procinfo dialog discover console-tools console-common iproute udev subversion liblinux-lvm-perl cfengine2 libapt-pkg-perl grub lilo read-edid linux-image-486 aufs-modules-2.6-486 
+nfs-common fai-nfsroot module-init-tools ssh rdate lshw portmap rsync lftp less dump reiserfsprogs e2fsprogs usbutils hwinfo psmisc pciutils hdparm smartmontools parted mdadm lvm2 dnsutils ntpdate dosfstools jove xfsprogs xfsdump procinfo dialog discover console-tools console-common iproute udev subversion liblinux-lvm-perl cfengine2 libapt-pkg-perl grub lilo read-edid linux-image-486
 install_packages: reading config files from directory /etc/fai
 install_packages: read config file NFSROOT
 .