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

Michael Tautschnig mt at alioth.debian.org
Thu Oct 14 23:26:09 UTC 2010


Author: mt
Date: 2010-10-14 23:26:08 +0000 (Thu, 14 Oct 2010)
New Revision: 6147

Removed:
   branches/experimental/patches/df-POSIX-bugfix
   branches/experimental/patches/improved-doc-of-hooks
   branches/experimental/patches/install-packages_hold-bugfix
   branches/experimental/patches/setup-storage_quote-preserved-type
   branches/experimental/patches/simple-example_squeeze
Modified:
   branches/experimental/patches/series
Log:
Several patches merged into trunk


Deleted: branches/experimental/patches/df-POSIX-bugfix
===================================================================
--- branches/experimental/patches/df-POSIX-bugfix	2010-10-14 23:24:47 UTC (rev 6146)
+++ branches/experimental/patches/df-POSIX-bugfix	2010-10-14 23:26:08 UTC (rev 6147)
@@ -1,30 +0,0 @@
-2010-10-12  Michael Tautschnig  <mt at debian.org>
-
-	* fai, make-fai-nfsroot: Use df -P for guaranteed one-line-is-one-mount output
-		(thanks michael log <mmlogin at gmail.com> for the patch).
-Index: trunk/bin/fai
-===================================================================
---- trunk.orig/bin/fai
-+++ trunk/bin/fai	
-@@ -225,7 +225,7 @@
-     FAI_ROOT=$(cd $FAI_ROOT;pwd)
- 
-     # check if target directory is mounted with bad options
--    fs=$(df $FAI_ROOT | tail -1 | awk '{print $6}')
-+    fs=$(df -P $FAI_ROOT | tail -1 | awk '{print $6}')
-     if mount | grep "on $fs " |  awk '{print $6}' | egrep -q "nosuid|nodev"; then
- 	echo "Target directory is mounted using nosuid or nodev. Aborting"
- 	exit 5
-Index: trunk/bin/make-fai-nfsroot
-===================================================================
---- trunk.orig/bin/make-fai-nfsroot
-+++ trunk/bin/make-fai-nfsroot	
-@@ -234,7 +234,7 @@
- call_debootstrap() {
-     
-     # check if NFSROOT directory is mounted with bad options
--    fs=$(df $NFSROOT | tail -1 | awk '{print $6}')
-+    fs=$(df -P $NFSROOT | tail -1 | awk '{print $6}')
-     if mount | grep "on $fs " |  awk '{print $6}' | egrep -q "nosuid|nodev"; then
-         die 1 "NFSROOT directory $NFSROOT is mounted using nosuid or nodev. Aborting"
-     fi

Deleted: branches/experimental/patches/improved-doc-of-hooks
===================================================================
--- branches/experimental/patches/improved-doc-of-hooks	2010-10-14 23:24:47 UTC (rev 6146)
+++ branches/experimental/patches/improved-doc-of-hooks	2010-10-14 23:26:08 UTC (rev 6147)
@@ -1,38 +0,0 @@
-2010-10-09  Michael Tautschnig  <mt at debian.org>
-
-	* fai-guide.txt: Improved documentation of hooks (thanks Peter Bittner).
-Index: trunk/doc/fai-guide.txt
-===================================================================
---- trunk.orig/doc/fai-guide.txt
-+++ trunk/doc/fai-guide.txt	
-@@ -1895,16 +1895,20 @@
- default tasks as parameters. The example 'partition.DISKLESS' skips
- some default tasks.
- 
--The directory '$FAI/hooks/' contains all hooks. The file name of a
--hook consists of a task name as a prefix and a class name, separated
--by a dot. The prefix describes the time when the hook is called, if
--the class is defined for the install client. For example, the hook
--'partition.DISKLESS' is called for every client belonging to the class
--_DISKLESS_ before the local disks would be partitioned. If it should
--become a diskless client, this hook can mount remote file systems via
--NFS and create a _/tmp/fai/fstab_.  After that, the installation
--process will not try to partition and format a local hard disk,
--because a file '/tmp/fai/fstab' already exists.
-+The directory '$FAI/hooks/' contains all hooks. A hook is an executable
-+file following the naming scheme 'taskname.CLASSNAME[.source]' (e.g.
-+'partition.DISKLESS' or 'partition.DISKLESS.source'), a task name and a
-+class name separated by a dot, optionally followed by '.source'. The
-+task name specifies which task to precede executing this hook, if the
-+specified class is defined for the installing client.  See section
-+<<tasks>> for a complete list of default tasks that can be used.
-+
-+In our example, the hook 'partition.DISKLESS' is called for every
-+client belonging to the class _DISKLESS_ before the local disks would
-+be partitioned. If it should become a diskless client, this hook can
-+mount remote file systems via NFS and create a _/tmp/fai/fstab_.  After
-+that, the installation process will not try to partition and format a
-+local hard disk, because a file '/tmp/fai/fstab' already exists.
- 
- A hook of the form _hookprefix.classname_ can't define variables for
- the installation script, because it's a subprocess. But you can use

Deleted: branches/experimental/patches/install-packages_hold-bugfix
===================================================================
--- branches/experimental/patches/install-packages_hold-bugfix	2010-10-14 23:24:47 UTC (rev 6146)
+++ branches/experimental/patches/install-packages_hold-bugfix	2010-10-14 23:26:08 UTC (rev 6147)
@@ -1,16 +0,0 @@
-2010-10-10  Michael Tautschnig  <mt at debian.org>
-
-	* install_packages: Fix dpkg hold output (thanks michael <mmlogin at gmail.com>).
-Index: trunk/bin/install_packages
-===================================================================
---- trunk.orig/bin/install_packages
-+++ trunk/bin/install_packages	
-@@ -184,7 +184,7 @@
-   my $packlist = join(' ',@{$list{$atype}});
- 
-   if ($atype eq "hold") {
--    my $hold = join " hold\n", @{$list{hold}}, " hold\n";
-+    my $hold = join " hold\n", @{$list{hold}}, "";
-     execute("echo \"$hold\" | $rootcmd $command{hold}");
-     next;
-   }

Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2010-10-14 23:24:47 UTC (rev 6146)
+++ branches/experimental/patches/series	2010-10-14 23:26:08 UTC (rev 6147)
@@ -17,10 +17,5 @@
 setup-storage_raw-disk
 fcopy_symlinks
 setup-storage_cryptsetup-passphrase
-simple-example_squeeze
-improved-doc-of-hooks
-setup-storage_quote-preserved-type
-install-packages_hold-bugfix
 setup-storage_no-empty-config
 setup-storage_entire-disk-in-volume
-df-POSIX-bugfix

Deleted: branches/experimental/patches/setup-storage_quote-preserved-type
===================================================================
--- branches/experimental/patches/setup-storage_quote-preserved-type	2010-10-14 23:24:47 UTC (rev 6146)
+++ branches/experimental/patches/setup-storage_quote-preserved-type	2010-10-14 23:26:08 UTC (rev 6147)
@@ -1,37 +0,0 @@
-2010-10-09  Michael Tautschnig  <mt at debian.org>
-
-	* setup-storage/Commands.pm: Quote fs argument in parted mkpart calls as
-	special characters may be in use that confuse the shell as in, e.g.,
-	linux-swap(v1) (thanks Peter Kruse for the patch).
-
-Index: trunk/lib/setup-storage/Commands.pm
-===================================================================
---- trunk.orig/lib/setup-storage/Commands.pm
-+++ trunk/lib/setup-storage/Commands.pm	
-@@ -864,7 +864,7 @@
-     $post .= ",rebuilt_" . &FAI::make_device_name($disk, $part_nr) if
-       $FAI::configs{$config}{partitions}{$part_id}{size}{resize};
-     # build a parted command to create the partition
--    &FAI::push_command( "parted -s $disk mkpart $part_type $fs ${start}B ${end}B",
-+    &FAI::push_command( "parted -s $disk mkpart $part_type \"$fs\" ${start}B ${end}B",
-       "cleared1_$disk", $post );
-   }
- }
-@@ -1063,7 +1063,7 @@
-     my $pre = "";
-     $pre = ",exist_" . &FAI::make_device_name($disk, $prev_id) if ($prev_id > -1);
-     # build a parted command to create the partition
--    &FAI::push_command( "parted -s $disk mkpart $part_type $fs ${start}B ${end}B",
-+    &FAI::push_command( "parted -s $disk mkpart $part_type \"$fs\" ${start}B ${end}B",
-       "cleared2_$disk$pre", "exist_" . &FAI::make_device_name($disk, $part_id) );
-     $prev_id = $part_id;
-   }
-@@ -1187,7 +1187,7 @@
-       my $fs = $curr_part->{filesystem};
- 
-       # build a parted command to create the partition
--      &FAI::execute_command("parted -s $disk mkpart $part_type $fs ${start}B ${end}B");
-+      &FAI::execute_command("parted -s $disk mkpart $part_type \"$fs\" ${start}B ${end}B");
-     }
-     warn "Partition table of disk $disk has been restored\n";
-   }

Deleted: branches/experimental/patches/simple-example_squeeze
===================================================================
--- branches/experimental/patches/simple-example_squeeze	2010-10-14 23:24:47 UTC (rev 6146)
+++ branches/experimental/patches/simple-example_squeeze	2010-10-14 23:26:08 UTC (rev 6147)
@@ -1,35 +0,0 @@
-2010-10-04  Michael Tautschnig  <mt at debian.org>
-
-	* examples/simple/disk_config/FAIBASE: Added bootable:1 as requested by
-		Maximiliano Curia (apparently still necessary on some systems).
-	* examples/simple/package_config/GNOME: Remove gnome-apt, ice*-gnome-support
-		as these don't exist in squeeze anymore (thanks Karl Wallner for reporting
-		this)
-Index: trunk/examples/simple/disk_config/FAIBASE
-===================================================================
---- trunk.orig/examples/simple/disk_config/FAIBASE
-+++ trunk/examples/simple/disk_config/FAIBASE	
-@@ -2,7 +2,7 @@
- #
- # <type> <mountpoint> <size>   <fs type> <mount options> <misc options>
- 
--disk_config disk1 disklabel:msdos fstabkey:uuid
-+disk_config disk1 disklabel:msdos bootable:1 fstabkey:uuid
- 
- primary /      250      ext3  rw,noatime,errors=remount-ro
- logical swap   200-1000 swap  rw                   
-Index: trunk/examples/simple/package_config/GNOME
-===================================================================
---- trunk.orig/examples/simple/package_config/GNOME
-+++ trunk/examples/simple/package_config/GNOME	
-@@ -2,10 +2,7 @@
- 
- iceweasel
- icedove
--iceweasel-gnome-support
--icedove-gnome-support
- menu gdm
--gnome-apt
- gnome-core
- desktop-base
- evince gconf-editor




More information about the Fai-commit mailing list