[Fai-commit] r5553 - people/michael/experimental/patches
Michael Tautschnig
mt at alioth.debian.org
Sat Oct 17 12:56:05 UTC 2009
Author: mt
Date: 2009-10-17 12:56:05 +0000 (Sat, 17 Oct 2009)
New Revision: 5553
Removed:
people/michael/experimental/patches/bugfix-481871
Modified:
people/michael/experimental/patches/logtail
people/michael/experimental/patches/series
people/michael/experimental/patches/setup-storage_full-crypto-support
Log:
- improved setup-storage cryto patch
- softupdate-patch fully merged in trunk
- updated patches to match new trunk
Deleted: people/michael/experimental/patches/bugfix-481871
===================================================================
--- people/michael/experimental/patches/bugfix-481871 2009-10-17 11:20:21 UTC (rev 5552)
+++ people/michael/experimental/patches/bugfix-481871 2009-10-17 12:56:05 UTC (rev 5553)
@@ -1,62 +0,0 @@
-2009-02-13 Michael Tautschnig <mt at debian.org>
-
- * examples/simple: Made all scripts idempotent and softupdate-capable
- (closes: #481871)
-Index: trunk/examples/simple/files/boot/grub/menu.lst/postinst
-===================================================================
---- trunk.orig/examples/simple/files/boot/grub/menu.lst/postinst
-+++ trunk/examples/simple/files/boot/grub/menu.lst/postinst
-@@ -4,8 +4,12 @@
-
- set -a
-
--# during softupdate use this file
--[ -r $target/var/log/fai/disk_var.sh ] && . $target/var/log/fai/disk_var.sh
-+if [ -r $LOGDIR/disk_var.sh ] ; then
-+ . $LOGDIR/disk_var.sh
-+else
-+ echo "disk_var.sh not found!"
-+ exit 0
-+fi
-
- # if class NOMBR is defined, write boot loader into root partition, not into mbr
- ifclass NOMBR && BOOT_DEVICE=$BOOT_PARTITION
-Index: trunk/examples/simple/scripts/FAIBASE/30-interface
-===================================================================
---- trunk.orig/examples/simple/scripts/FAIBASE/30-interface
-+++ trunk/examples/simple/scripts/FAIBASE/30-interface
-@@ -2,7 +2,7 @@
-
- error=0 ; trap "error=$((error|1))" ERR
-
--if ifclass DHCPC
-+if ifclass DHCPC && [ $FAI_ACTION != "softupdate" ]
- then
- cat > $target/etc/network/interfaces <<-EOF
- # generated by FAI
-@@ -23,11 +23,11 @@
- EOF
- [ -n "$NETWORK" ] && echo "localnet $NETWORK" > $target/etc/networks
- [ -s /etc/resolv.conf ] && cp -p /etc/resolv.conf $target/etc
-- fcopy -i /etc/resolv.conf
- fi
-
- # here fcopy is mostly used, when installing a client for running in a
- # different subnet than during the installation
-+fcopy -i /etc/resolv.conf
- fcopy -iM /etc/network/interfaces /etc/networks
-
- exit $error
-Index: trunk/examples/simple/scripts/GRUB/10-setup
-===================================================================
---- trunk.orig/examples/simple/scripts/GRUB/10-setup
-+++ trunk/examples/simple/scripts/GRUB/10-setup
-@@ -2,7 +2,7 @@
-
- error=0 ; trap "error=$((error|1))" ERR
-
--fcopy -Uv /boot/grub/menu.lst
-+fcopy -v /boot/grub/menu.lst
-
- exit $error
-
Modified: people/michael/experimental/patches/logtail
===================================================================
--- people/michael/experimental/patches/logtail 2009-10-17 11:20:21 UTC (rev 5552)
+++ people/michael/experimental/patches/logtail 2009-10-17 12:56:05 UTC (rev 5553)
@@ -6,7 +6,7 @@
===================================================================
--- trunk.orig/bin/fai
+++ trunk/bin/fai
-@@ -280,6 +280,9 @@
+@@ -291,6 +291,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-17 11:20:21 UTC (rev 5552)
+++ people/michael/experimental/patches/series 2009-10-17 12:56:05 UTC (rev 5553)
@@ -4,7 +4,6 @@
bugfix-506459
bugfix-412889
bugfix-313397
-bugfix-481871
bugfix-479537
setup-storage_full-crypto-support
setup-storage_no-cylinder-boundaries
Modified: people/michael/experimental/patches/setup-storage_full-crypto-support
===================================================================
--- people/michael/experimental/patches/setup-storage_full-crypto-support 2009-10-17 11:20:21 UTC (rev 5552)
+++ people/michael/experimental/patches/setup-storage_full-crypto-support 2009-10-17 12:56:05 UTC (rev 5553)
@@ -182,3 +182,44 @@
################################################################################
#
# @brief Convert a device name and a partition id to a proper device name,
+Index: trunk/lib/subroutines
+===================================================================
+--- trunk.orig/lib/subroutines
++++ trunk/lib/subroutines
+@@ -780,6 +780,8 @@
+ # now we can copy fstab
+ [ -f $fs ] && mv $fs $fs.old
+ [ -f $LOGDIR/fstab ] && cp -p $LOGDIR/fstab $fs
++ # copy crypttab, if setup-storage created one
++ [ -f $LOGDIR/crypttab ] && cp -p $LOGDIR/crypttab $FAI_ROOT/etc/crypttab
+ }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ ### BEGIN SUBROUTINE INFO
+Index: trunk/man/setup-storage.8
+===================================================================
+--- trunk.orig/man/setup-storage.8
++++ trunk/man/setup-storage.8
+@@ -270,9 +270,9 @@
+ .br
+ * if :encrypt is given the partition will be encrypted, the key
+ .br
+- * is generated automatically; :randinit adds random
++ * is generated automatically; :randinit causes random
+ .br
+- * initialization of the partition */
++ * initialization of the partition by setup-storage */
+ .br
+
+
+@@ -432,6 +432,11 @@
+ If you want to be sure not boot failures happen because of a missing bootable
+ marker, explicitly set the bootable option. Of course, there are lots of other
+ reasons why a system may fail to boot.
++.IP \(bu
++Crypto support requires some site-specific changes: If you use :encrypt on some
++of your volumes, a crypttab file and key files for all such volumes will be
++created. The key files are left in /tmp/fai; you will want to copy these to some
++removable media or even replace them with /dev/urandom for tmp and swap.
+ .SH SEE ALSO
+ This program is part of FAI (Fully Automatic Installation).
+ The FAI homepage is http://www.informatik.uni-koeln.de/fai.
More information about the Fai-commit
mailing list