[Fai-commit] r5808 - branches/experimental/patches

Michael Tautschnig mt at alioth.debian.org
Fri Jun 18 10:59:16 UTC 2010 

Author: mt
Date: 2010-06-18 10:59:15 +0000 (Fri, 18 Jun 2010)
New Revision: 5808

Removed:
   branches/experimental/patches/setup-storage_package
Modified:
   branches/experimental/patches/grub-pc
   branches/experimental/patches/logtail
   branches/experimental/patches/series
Log:
setup-storage separate-package patch moved into trunk, updated other patches


Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2010-06-18 10:57:14 UTC (rev 5807)
+++ branches/experimental/patches/grub-pc	2010-06-18 10:59:15 UTC (rev 5808)
@@ -10,8 +10,8 @@
 	* Makefile: Make sure that all example scripts are executable
 Index: trunk/Makefile
 ===================================================================
---- trunk.orig/Makefile	2010-05-31 16:44:13.000000000 +0200
-+++ trunk/Makefile	2010-05-31 16:44:24.000000000 +0200
+--- trunk.orig/Makefile
++++ trunk/Makefile	
 @@ -47,6 +47,7 @@
  	install -p -m644 pixmaps/*.gif $(DESTDIR)/usr/share/fai/pixmaps
  	perl -pi -e 's/FAIVERSIONSTRING/$(VERSIONSTRING)/' $(DESTDIR)/usr/sbin/fai
@@ -22,8 +22,8 @@
  
 Index: trunk/examples/simple/package_config/DEFAULT
 ===================================================================
---- trunk.orig/examples/simple/package_config/DEFAULT	2010-05-31 16:44:13.000000000 +0200
-+++ trunk/examples/simple/package_config/DEFAULT	2010-05-31 16:44:24.000000000 +0200
+--- trunk.orig/examples/simple/package_config/DEFAULT
++++ trunk/examples/simple/package_config/DEFAULT	
 @@ -17,10 +17,10 @@
  dhcp3-client
  
@@ -39,8 +39,8 @@
 +lilo grub- grub-pc-
 Index: trunk/examples/simple/scripts/GRUB_PC/10-setup
 ===================================================================
---- trunk.orig/examples/simple/scripts/GRUB_PC/10-setup	2010-05-31 16:44:13.000000000 +0200
-+++ trunk/examples/simple/scripts/GRUB_PC/10-setup	2010-05-31 16:44:24.000000000 +0200
+--- trunk.orig/examples/simple/scripts/GRUB_PC/10-setup
++++ trunk/examples/simple/scripts/GRUB_PC/10-setup	
 @@ -2,8 +2,25 @@
  
  error=0 ; trap "error=$((error|1))" ERR
@@ -72,8 +72,8 @@
 +
 Index: trunk/examples/simple/class/50-host-classes
 ===================================================================
---- trunk.orig/examples/simple/class/50-host-classes	2010-05-31 16:44:13.000000000 +0200
-+++ trunk/examples/simple/class/50-host-classes	2010-05-31 16:44:24.000000000 +0200
+--- trunk.orig/examples/simple/class/50-host-classes
++++ trunk/examples/simple/class/50-host-classes	
 @@ -20,5 +20,4 @@
  	echo "FAIBASE DHCPC" ;;
  esac
@@ -83,7 +83,7 @@
 Index: trunk/examples/simple/class/51-grub
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ trunk/examples/simple/class/51-grub	2010-05-31 16:44:24.000000000 +0200
++++ trunk/examples/simple/class/51-grub	
 @@ -0,0 +1,4 @@
 +#! /bin/bash
 +
@@ -91,8 +91,8 @@
 +exit 0
 Index: trunk/lib/setup-storage/Fstab.pm
 ===================================================================
---- trunk.orig/lib/setup-storage/Fstab.pm	2010-05-31 16:44:13.000000000 +0200
-+++ trunk/lib/setup-storage/Fstab.pm	2010-05-31 16:45:07.000000000 +0200
+--- trunk.orig/lib/setup-storage/Fstab.pm
++++ trunk/lib/setup-storage/Fstab.pm	
 @@ -127,6 +127,54 @@
    }
  }
@@ -248,8 +248,8 @@
    # sort the lines in @fstab to enable all sub mounts
 Index: trunk/man/setup-storage.8
 ===================================================================
---- trunk.orig/man/setup-storage.8	2010-05-31 16:44:13.000000000 +0200
-+++ trunk/man/setup-storage.8	2010-05-31 16:44:24.000000000 +0200
+--- trunk.orig/man/setup-storage.8
++++ trunk/man/setup-storage.8	
 @@ -106,10 +106,9 @@
  .IR SWAPLIST ,
  .IR ROOT_PARTITION ,

Modified: branches/experimental/patches/logtail
===================================================================
--- branches/experimental/patches/logtail	2010-06-18 10:57:14 UTC (rev 5807)
+++ branches/experimental/patches/logtail	2010-06-18 10:59:15 UTC (rev 5808)
@@ -20,12 +20,11 @@
 ===================================================================
 --- trunk.orig/debian/control
 +++ trunk/debian/control	
-@@ -14,7 +14,7 @@
+@@ -14,6 +14,7 @@
  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
-+Suggests: ntfsprogs, dmsetup, cryptsetup, logtail
++Suggests: logtail
  Conflicts: fai, fai-kernels
  Replaces: fai
  Description: Fully Automatic Installation client package

Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2010-06-18 10:57:14 UTC (rev 5807)
+++ branches/experimental/patches/series	2010-06-18 10:59:15 UTC (rev 5808)
@@ -9,7 +9,6 @@
 setup-storage_lvm-preserve2
 setup-storage_resize2fs
 setup-storage_always-format
-setup-storage_package
 setup-storage_parted2.2
 setup-storage_empty-vg
 setup-storage_abs-path

Deleted: branches/experimental/patches/setup-storage_package
===================================================================
--- branches/experimental/patches/setup-storage_package	2010-06-18 10:57:14 UTC (rev 5807)
+++ branches/experimental/patches/setup-storage_package	2010-06-18 10:59:15 UTC (rev 5808)
@@ -1,93 +0,0 @@
-2010-04-13  Michael Tautschnig  <mt at debian.org>
-
-	* control: Move setup-storage to its own package (fai-setup-storage). Thanks
-		Michael Prokop <mika at debian.org> for the patch (closes: #575812)
-Index: trunk/debian/control
-===================================================================
---- trunk.orig/debian/control
-+++ trunk/debian/control	
-@@ -12,9 +12,9 @@
- 
- 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, logtail
-+Suggests: logtail
- Conflicts: fai, fai-kernels
- Replaces: fai
- Description: Fully Automatic Installation client package
-@@ -84,3 +84,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.
-Index: trunk/debian/fai-client.install
-===================================================================
---- trunk.orig/debian/fai-client.install
-+++ trunk/debian/fai-client.install	
-@@ -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
-Index: trunk/debian/fai-client.manpages
-===================================================================
---- trunk.orig/debian/fai-client.manpages
-+++ trunk/debian/fai-client.manpages	
-@@ -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
-Index: trunk/debian/fai-setup-storage.install
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ trunk/debian/fai-setup-storage.install	
-@@ -0,0 +1,4 @@
-+usr/lib/fai/disk-info
-+usr/lib/fai/fai-vol_id
-+usr/sbin/setup-storage
-+usr/share/fai/setup-storage
-Index: trunk/debian/fai-setup-storage.manpages
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ trunk/debian/fai-setup-storage.manpages	
-@@ -0,0 +1 @@
-+debian/tmp/man/setup-storage.8

More information about the Fai-commit mailing list