[Fai-commit] r5806 - trunk/debian

[Michael Tautschnig]

Author: mt
Date: 2010-06-18 10:54:52 +0000 (Fri, 18 Jun 2010)
New Revision: 5806

Added:
   trunk/debian/fai-setup-storage.install
   trunk/debian/fai-setup-storage.manpages
Modified:
   trunk/debian/control
   trunk/debian/fai-client.install
   trunk/debian/fai-client.manpages
Log:
move setup-storage into a separate package (fai-setup-storage)


Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2010-06-15 21:11:54 UTC (rev 5805)
+++ trunk/debian/control	2010-06-18 10:54:52 UTC (rev 5806)
@@ -12,9 +12,8 @@
 
 Package: fai-client
 Architecture: all
-Depends: perl, file, libapt-pkg-perl, libparse-recdescent-perl, liblinux-lvm-perl, iproute
+Depends: perl, file, libapt-pkg-perl, iproute, fai-setup-storage
 Recommends: debconf-utils, cfengine2
-Suggests: ntfsprogs, dmsetup, cryptsetup
 Conflicts: fai, fai-kernels
 Replaces: fai
 Description: Fully Automatic Installation client package
@@ -84,3 +83,21 @@
  .
  This package contains the software that is only needed in
  the FAI nfsroot. Do not install this package on a normal machine.
+
+Package: fai-setup-storage
+Architecture: all
+Depends: perl, libparse-recdescent-perl, liblinux-lvm-perl, parted
+Recommends: lvm2, mdadm
+Suggests: dmsetup, cryptsetup, dosfstools, jfsutils, ntfsprogs, reiserfsprogs, xfsprogs
+Conflicts: fai-client (<< 3.4~)
+Description: automatically prepare storage devices
+  Using FAI disk_config files, setup-storage computes effective
+  partition and volume sizes and executes the necessary commands
+  to configure storage devices. It manages disk drives as well
+  as RAID and LVM volumes. It handles all file systems supported
+  by parted(8) as well as ntfs but is flexible enough to be
+  extended to further types as well. Once the storage devices
+  are prepared, an appropriate fstab(5) file is generated.
+  .
+  This package provides the setup-storage utility as separate
+  package so it can be used independent from FAI as well.

Modified: trunk/debian/fai-client.install
===================================================================
--- trunk/debian/fai-client.install	2010-06-15 21:11:54 UTC (rev 5805)
+++ trunk/debian/fai-client.install	2010-06-18 10:54:52 UTC (rev 5806)
@@ -3,14 +3,12 @@
 usr/lib/fai/fai-savelog
 usr/lib/fai/fai-savelog-ftp
 usr/lib/fai/get-boot-info
-usr/lib/fai/disk-info
 usr/lib/fai/list_disks
 usr/lib/fai/subroutines
 usr/lib/fai/updatebase
 usr/lib/fai/prcopyleft
 usr/lib/fai/get-config-dir*
 usr/lib/fai/fai-divert
-usr/lib/fai/fai-vol_id
 usr/lib/fai/mkramdisk
 usr/bin/device2grub
 usr/bin/fai-class
@@ -22,6 +20,4 @@
 usr/sbin/ftar
 usr/sbin/install_packages
 usr/sbin/setup_harddisks
-usr/sbin/setup-storage
 usr/sbin/fai-statoverride
-usr/share/fai/setup-storage

Modified: trunk/debian/fai-client.manpages
===================================================================
--- trunk/debian/fai-client.manpages	2010-06-15 21:11:54 UTC (rev 5805)
+++ trunk/debian/fai-client.manpages	2010-06-18 10:54:52 UTC (rev 5806)
@@ -6,5 +6,4 @@
 debian/tmp/man/fai-debconf.1
 debian/tmp/man/fai-do-scripts.1
 debian/tmp/man/ainsl.1
-debian/tmp/man/setup-storage.8
 debian/tmp/man/fai-statoverride.8

Added: trunk/debian/fai-setup-storage.install
===================================================================
--- trunk/debian/fai-setup-storage.install	                        (rev 0)
+++ trunk/debian/fai-setup-storage.install	2010-06-18 10:54:52 UTC (rev 5806)
@@ -0,0 +1,4 @@
+usr/lib/fai/disk-info
+usr/lib/fai/fai-vol_id
+usr/sbin/setup-storage
+usr/share/fai/setup-storage

Added: trunk/debian/fai-setup-storage.manpages
===================================================================
--- trunk/debian/fai-setup-storage.manpages	                        (rev 0)
+++ trunk/debian/fai-setup-storage.manpages	2010-06-18 10:54:52 UTC (rev 5806)
@@ -0,0 +1 @@
+debian/tmp/man/setup-storage.8