[Fai-commit] r5581 - people/michael/experimental/patches
Michael Tautschnig
mt at alioth.debian.org
Wed Oct 21 09:42:47 UTC 2009
Author: mt
Date: 2009-10-21 09:42:46 +0000 (Wed, 21 Oct 2009)
New Revision: 5581
Removed:
people/michael/experimental/patches/bugfix-506459
Modified:
people/michael/experimental/patches/bugfix-479537
people/michael/experimental/patches/logtail
people/michael/experimental/patches/series
people/michael/experimental/patches/setup-storage_full-crypto-support
Log:
Updated patches to match current trunk, removed patch for #506459 as Thomas
intends not have all the $VCS in there by default
Modified: people/michael/experimental/patches/bugfix-479537
===================================================================
--- people/michael/experimental/patches/bugfix-479537 2009-10-20 14:16:00 UTC (rev 5580)
+++ people/michael/experimental/patches/bugfix-479537 2009-10-21 09:42:46 UTC (rev 5581)
@@ -8,18 +8,16 @@
===================================================================
--- trunk.orig/debian/NEWS
+++ trunk/debian/NEWS
-@@ -1,3 +1,11 @@
-+fai (3.2.XXX+experimentalX) unstable; urgency=low
-+
+@@ -5,6 +5,9 @@
+ - cvs, bootpc, expect and mdetect are not installed by default into the
+ nfsroot
+ - dirinstall now uses FAI_CONFIG_SRC instead of FAI_CONFIGDIR
+ - Changed semantics of class lists in PACKAGES (install|aptitude|...) to
+ Boolean AND and added support for negation (using !), see also
+ https://lists.uni-koeln.de/pipermail/linux-fai-devel/2008q2/000530.html
-+
-+ -- Thomas Lange <lange at debian.org> Fri, 20 Mar 2009 18:25:17 +0100
-+
- fai (3.2.XXX) unstable; urgency=low
+
+ -- Thomas Lange <lange at debian.org> Tue, 20 Oct 2009 12:33:43 +0200
- - variable FAI_CONFIGDIR moved from fai.conf to make-fai-nfsroot.conf
Index: trunk/bin/install_packages
===================================================================
--- trunk.orig/bin/install_packages
Deleted: people/michael/experimental/patches/bugfix-506459
===================================================================
--- people/michael/experimental/patches/bugfix-506459 2009-10-20 14:16:00 UTC (rev 5580)
+++ people/michael/experimental/patches/bugfix-506459 2009-10-21 09:42:46 UTC (rev 5581)
@@ -1,16 +0,0 @@
-2009-02-13 Michael Tautschnig <mt at debian.org>
-
- * conf/NFSROOT: Added git-core (thanks Sebastian Harl) (closes: #506459)
-Index: trunk/conf/NFSROOT
-===================================================================
---- trunk.orig/conf/NFSROOT
-+++ trunk/conf/NFSROOT
-@@ -7,7 +7,7 @@
- dnsutils ntpdate dosfstools cvs jove xfsprogs xfsdump
- procinfo dialog discover mdetect
- console-tools console-common
--expect iproute udev subversion liblinux-lvm-perl
-+expect iproute udev subversion liblinux-lvm-perl git-core
-
- # needed for the simple examples
- cfengine2 libapt-pkg-perl
Modified: people/michael/experimental/patches/logtail
===================================================================
--- people/michael/experimental/patches/logtail 2009-10-20 14:16:00 UTC (rev 5580)
+++ people/michael/experimental/patches/logtail 2009-10-21 09:42:46 UTC (rev 5581)
@@ -6,7 +6,7 @@
===================================================================
--- trunk.orig/bin/fai
+++ trunk/bin/fai
-@@ -291,6 +291,9 @@
+@@ -293,6 +293,9 @@
mkdir -p $LOGDIR
ln -snf $action-$fai_rundate $LOGDIR/../last-$action
ln -snf $action-$fai_rundate $LOGDIR/../last
Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series 2009-10-20 14:16:00 UTC (rev 5580)
+++ people/michael/experimental/patches/series 2009-10-21 09:42:46 UTC (rev 5581)
@@ -1,7 +1,6 @@
setup-storage_exp-version
logtail
grub-pc
-bugfix-506459
bugfix-412889
bugfix-313397
bugfix-479537
Modified: people/michael/experimental/patches/setup-storage_full-crypto-support
===================================================================
--- people/michael/experimental/patches/setup-storage_full-crypto-support 2009-10-20 14:16:00 UTC (rev 5580)
+++ people/michael/experimental/patches/setup-storage_full-crypto-support 2009-10-21 09:42:46 UTC (rev 5581)
@@ -91,7 +91,7 @@
===================================================================
--- trunk.orig/lib/setup-storage/Fstab.pm
+++ trunk/lib/setup-storage/Fstab.pm
-@@ -163,12 +163,8 @@
+@@ -167,12 +167,8 @@
# skip extended partitions and entries without a mountpoint
next if ($p_ref->{size}->{extended} || $p_ref->{mountpoint} eq "-");
@@ -106,7 +106,7 @@
# if the mount point is / or /boot, the variables should be set, unless
# they are already
-@@ -215,9 +211,7 @@
+@@ -219,9 +215,7 @@
my $device_name = "/dev/$device/$l";
if ($l_ref->{encrypt}) {
@@ -117,7 +117,7 @@
} else {
$device_name = $fstab_key[0];
}
-@@ -247,12 +241,7 @@
+@@ -251,12 +245,7 @@
# skip entries without a mountpoint
next if ($r_ref->{mountpoint} eq "-");
More information about the Fai-commit
mailing list