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

Michael Tautschnig mt at alioth.debian.org
Sat Jul 10 08:32:34 UTC 2010 

Author: mt
Date: 2010-07-10 08:32:31 +0000 (Sat, 10 Jul 2010)
New Revision: 5859

Modified:
   branches/experimental/patches/bugfix-313397
   branches/experimental/patches/bugfix-479537
   branches/experimental/patches/device2grub_stable_names
   branches/experimental/patches/fix-eval_cmdline
   branches/experimental/patches/grub-pc
   branches/experimental/patches/setup-storage_always-format
   branches/experimental/patches/setup-storage_external-journal
   branches/experimental/patches/setup-storage_preserve-lazy
   branches/experimental/patches/setup-storage_ramsize
   branches/experimental/patches/setup-storage_tmpfs
   branches/experimental/patches/simple-examples_splitout_DEBIAN
Log:
Fixed simple-examples_splitout_DEBIAN patch (at least in a way that it applies,
not sure whether this is still complete), update further patches


Modified: branches/experimental/patches/bugfix-313397
===================================================================
--- branches/experimental/patches/bugfix-313397	2010-07-09 22:17:39 UTC (rev 5858)
+++ branches/experimental/patches/bugfix-313397	2010-07-10 08:32:31 UTC (rev 5859)
@@ -1,16 +1,16 @@
 2009-02-13  Michael Tautschnig  <mt at debian.org>
 
-	* examples/simple/files/etc/ucf.conf/FAIBASE: Added example ucf configuration
+	* examples/simple/files/etc/ucf.conf/DEBIAN: Added example ucf configuration
 		that enforces choosing the default option non-interactively (closes: #313397)
 	* examples/simple/files/etc/apt/apt.conf.d/force_confdef/FAIBASE: Added dpkg
 		option --force-confdef for apt/aptitude to make it non-interactive when
 		config files have been changed (closes: #502394)
-	* examples/simple/hooks/instsoft.FAIBASE: Copy those files before installing
+	* examples/simple/hooks/instsoft.DEBIAN: Copy those files before installing
 		any packages
-Index: trunk/examples/simple/files/etc/ucf.conf/FAIBASE
+Index: trunk/examples/simple/files/etc/ucf.conf/DEBIAN
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ trunk/examples/simple/files/etc/ucf.conf/FAIBASE	
++++ trunk/examples/simple/files/etc/ucf.conf/DEBIAN	
 @@ -0,0 +1,39 @@
 +#
 +# This file is a bourne shell snippet, and is sourced by the
@@ -63,10 +63,10 @@
 +	  }
 +};
 +
-Index: trunk/examples/simple/hooks/instsoft.FAIBASE
+Index: trunk/examples/simple/hooks/instsoft.DEBIAN
 ===================================================================
---- trunk.orig/examples/simple/hooks/instsoft.FAIBASE
-+++ trunk/examples/simple/hooks/instsoft.FAIBASE	
+--- trunk.orig/examples/simple/hooks/instsoft.DEBIAN
++++ trunk/examples/simple/hooks/instsoft.DEBIAN	
 @@ -1,3 +1,6 @@
  #! /bin/bash
  

Modified: branches/experimental/patches/bugfix-479537
===================================================================
--- branches/experimental/patches/bugfix-479537	2010-07-09 22:17:39 UTC (rev 5858)
+++ branches/experimental/patches/bugfix-479537	2010-07-10 08:32:31 UTC (rev 5859)
@@ -8,7 +8,7 @@
 ===================================================================
 --- trunk.orig/debian/NEWS
 +++ trunk/debian/NEWS	
-@@ -6,6 +6,9 @@
+@@ -12,6 +12,9 @@
    - files named package_config/*.asc are added to the list of apt keys
    - cvs, bootpc, expect and mdetect are not installed by default into the
      nfsroot

Modified: branches/experimental/patches/device2grub_stable_names
===================================================================
--- branches/experimental/patches/device2grub_stable_names	2010-07-09 22:17:39 UTC (rev 5858)
+++ branches/experimental/patches/device2grub_stable_names	2010-07-10 08:32:31 UTC (rev 5859)
@@ -4,8 +4,8 @@
 	grub2 in unstable has switched to using stable names in device.map.
 Index: trunk/bin/device2grub
 ===================================================================
---- trunk.orig/bin/device2grub	2010-07-07 17:58:55.160374252 +0200
-+++ trunk/bin/device2grub	2010-07-07 17:58:46.200397745 +0200
+--- trunk.orig/bin/device2grub
++++ trunk/bin/device2grub	
 @@ -5,11 +5,15 @@
  # TODO: read from stdin if no parameter given
  

Modified: branches/experimental/patches/fix-eval_cmdline
===================================================================
--- branches/experimental/patches/fix-eval_cmdline	2010-07-09 22:17:39 UTC (rev 5858)
+++ branches/experimental/patches/fix-eval_cmdline	2010-07-10 08:32:31 UTC (rev 5859)
@@ -7,7 +7,7 @@
 ===================================================================
 --- trunk.orig/lib/subroutines
 +++ trunk/lib/subroutines	
-@@ -651,18 +651,22 @@
+@@ -661,18 +661,22 @@
      echo -n "Kernel currently running: "
      uname -rsmo
      echo -n "Kernel parameters: "; cat /proc/cmdline

Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2010-07-09 22:17:39 UTC (rev 5858)
+++ branches/experimental/patches/grub-pc	2010-07-10 08:32:31 UTC (rev 5859)
@@ -20,10 +20,10 @@
  	cp -a utils $(DOCDIR)/examples
  	find $(DOCDIR) -name .svn | xargs rm -rf
  
-Index: trunk/examples/simple/package_config/DEFAULT
+Index: trunk/examples/simple/package_config/DEBIAN
 ===================================================================
---- trunk.orig/examples/simple/package_config/DEFAULT
-+++ trunk/examples/simple/package_config/DEFAULT	
+--- trunk.orig/examples/simple/package_config/DEBIAN
++++ trunk/examples/simple/package_config/DEBIAN	
 @@ -17,10 +17,10 @@
  dhcp3-client
  
@@ -75,7 +75,7 @@
 --- trunk.orig/examples/simple/class/50-host-classes
 +++ trunk/examples/simple/class/50-host-classes	
 @@ -20,5 +20,4 @@
- 	echo "FAIBASE DHCPC" ;;
+ 	echo "FAIBASE DEBIAN DHCPC" ;;
  esac
  
 -(ifclass I386 || ifclass AMD64) && echo GRUB 
@@ -250,7 +250,7 @@
 ===================================================================
 --- trunk.orig/man/setup-storage.8
 +++ trunk/man/setup-storage.8	
-@@ -111,10 +111,9 @@
+@@ -105,10 +105,9 @@
  .IR SWAPLIST ,
  .IR ROOT_PARTITION ,
  .IR BOOT_PARTITION

Modified: branches/experimental/patches/setup-storage_always-format
===================================================================
--- branches/experimental/patches/setup-storage_always-format	2010-07-09 22:17:39 UTC (rev 5858)
+++ branches/experimental/patches/setup-storage_always-format	2010-07-10 08:32:31 UTC (rev 5859)
@@ -128,7 +128,7 @@
 ===================================================================
 --- trunk.orig/man/setup-storage.8
 +++ trunk/man/setup-storage.8	
-@@ -174,6 +174,10 @@
+@@ -168,6 +168,10 @@
  .br
             /* preserve volumes -- unless these don't exist yet */
  .br
@@ -139,7 +139,7 @@
             | resize:[^/,\\s\\-]+-[^/,\\s\\-]+(,[^/,\\s\\-]+-[^/,\\s\\-]+)*
  .br
             /* attempt to resize partitions */
-@@ -204,6 +208,10 @@
+@@ -198,6 +202,10 @@
  .br
             /* preserve volumes -- unless these don't exist yet */
  .br
@@ -150,7 +150,7 @@
             | fstabkey:(device|label|uuid)
  .br
             /* when creating the fstab the key used for defining the device
-@@ -238,6 +246,10 @@
+@@ -232,6 +240,10 @@
  .br
             /* preserve partitions -- unless these don't exist yet */
  .br
@@ -161,7 +161,7 @@
             | resize:[[:digit:]]+(,[[:digit:]]+)*
  .br
             /* attempt to resize partitions */
-@@ -402,6 +414,9 @@
+@@ -396,6 +408,9 @@
  one of the FAI_FLAGS. preserve_lazy allows to preserve partitions only if these
  exist already. Otherwise they are created.
  .IP \(bu

Modified: branches/experimental/patches/setup-storage_external-journal
===================================================================
--- branches/experimental/patches/setup-storage_external-journal	2010-07-09 22:17:39 UTC (rev 5858)
+++ branches/experimental/patches/setup-storage_external-journal	2010-07-10 08:32:31 UTC (rev 5859)
@@ -123,7 +123,7 @@
 ===================================================================
 --- trunk.orig/man/setup-storage.8
 +++ trunk/man/setup-storage.8	
-@@ -542,6 +542,33 @@
+@@ -536,6 +536,33 @@
  .IP \(bu
  Mount a tmpfs on /scratch with a maximum size of 3 GiB.
  

Modified: branches/experimental/patches/setup-storage_preserve-lazy
===================================================================
--- branches/experimental/patches/setup-storage_preserve-lazy	2010-07-09 22:17:39 UTC (rev 5858)
+++ branches/experimental/patches/setup-storage_preserve-lazy	2010-07-10 08:32:31 UTC (rev 5859)
@@ -134,7 +134,7 @@
 ===================================================================
 --- trunk.orig/man/setup-storage.8
 +++ trunk/man/setup-storage.8	
-@@ -162,14 +162,18 @@
+@@ -156,14 +156,18 @@
  .br
             | preserve_always:[^/,\\s\\-]+-[^/,\\s\\-]+(,[^/,\\s\\-]+-[^/,\\s\\-]+)*
  .br
@@ -155,7 +155,7 @@
             | resize:[^/,\\s\\-]+-[^/,\\s\\-]+(,[^/,\\s\\-]+-[^/,\\s\\-]+)*
  .br
             /* attempt to resize partitions */
-@@ -188,14 +192,18 @@
+@@ -182,14 +186,18 @@
  .br
             | preserve_always:[[:digit:]]+(,[[:digit:]]+)*
  .br
@@ -176,7 +176,7 @@
             | fstabkey:(device|label|uuid)
  .br
             /* when creating the fstab the key used for defining the device
-@@ -226,6 +234,10 @@
+@@ -220,6 +228,10 @@
  .br
             first time */
  .br
@@ -187,7 +187,7 @@
             | resize:[[:digit:]]+(,[[:digit:]]+)*
  .br
             /* attempt to resize partitions */
-@@ -384,10 +396,11 @@
+@@ -378,10 +390,11 @@
  Any options to mkfs.xxx may be given using createopts="".
  .IP \(bu
  The "preserveX" and "boot" options are one of the options now given on the

Modified: branches/experimental/patches/setup-storage_ramsize
===================================================================
--- branches/experimental/patches/setup-storage_ramsize	2010-07-09 22:17:39 UTC (rev 5858)
+++ branches/experimental/patches/setup-storage_ramsize	2010-07-10 08:32:31 UTC (rev 5859)
@@ -79,7 +79,7 @@
 ===================================================================
 --- trunk.orig/man/setup-storage.8
 +++ trunk/man/setup-storage.8	
-@@ -346,19 +346,19 @@
+@@ -340,19 +340,19 @@
  .br
  
  

Modified: branches/experimental/patches/setup-storage_tmpfs
===================================================================
--- branches/experimental/patches/setup-storage_tmpfs	2010-07-09 22:17:39 UTC (rev 5858)
+++ branches/experimental/patches/setup-storage_tmpfs	2010-07-10 08:32:31 UTC (rev 5859)
@@ -222,7 +222,7 @@
 ===================================================================
 --- trunk.orig/man/setup-storage.8
 +++ trunk/man/setup-storage.8	
-@@ -142,6 +142,8 @@
+@@ -136,6 +136,8 @@
  .br
             | disk_config cryptsetup( <cryptsetupoption>)*
  .br
@@ -231,7 +231,7 @@
             | disk_config end 
  .br
             | disk_config disk[[:digit:]]+( <option>)*
-@@ -294,6 +296,10 @@
+@@ -288,6 +290,10 @@
  .br
             /* lvm vg */
  .br
@@ -242,7 +242,7 @@
  
  
  type ::= primary
-@@ -372,6 +378,14 @@
+@@ -366,6 +372,14 @@
  .br
  
  
@@ -257,7 +257,7 @@
  mount_options ::= [^[:space:]]+
  .br
  
-@@ -509,6 +523,25 @@
+@@ -503,6 +517,25 @@
  .sp
  .fi
  .PP

Modified: branches/experimental/patches/simple-examples_splitout_DEBIAN
===================================================================
--- branches/experimental/patches/simple-examples_splitout_DEBIAN	2010-07-09 22:17:39 UTC (rev 5858)
+++ branches/experimental/patches/simple-examples_splitout_DEBIAN	2010-07-10 08:32:31 UTC (rev 5859)
@@ -1,6 +1,7 @@
-diff -urN -x .svn examples/simple/class/50-host-classes ../people/mgoetze/simple/class/50-host-classes
---- examples/simple/class/50-host-classes	2010-07-03 11:43:02.000000000 +0200
-+++ ../people/mgoetze/simple/class/50-host-classes	2010-07-04 11:51:04.000000000 +0200
+Index: examples/simple/class/50-host-classes
+===================================================================
+--- examples/simple/class/50-host-classes.orig
++++ examples/simple/class/50-host-classes	
 @@ -5,19 +5,19 @@
  # use a list of classes for our demo machine
  case $HOSTNAME in
@@ -28,17 +29,19 @@
  esac
  
  (ifclass I386 || ifclass AMD64) && echo GRUB 
-diff -urN -x .svn examples/simple/debconf/DEBIAN ../people/mgoetze/simple/debconf/DEBIAN
---- examples/simple/debconf/DEBIAN	1970-01-01 01:00:00.000000000 +0100
-+++ ../people/mgoetze/simple/debconf/DEBIAN	2010-07-04 11:52:37.000000000 +0200
+Index: examples/simple/debconf/DEBIAN
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ examples/simple/debconf/DEBIAN	
 @@ -0,0 +1,4 @@
 +passwd passwd/shadow boolean true
 +exim4-config exim4/dc_eximconfig_configtype select local delivery only; not on a network
 +locales locales/default_environment_locale select en_US.UTF-8
 +locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8
-diff -urN -x .svn examples/simple/debconf/FAIBASE ../people/mgoetze/simple/debconf/FAIBASE
---- examples/simple/debconf/FAIBASE	2010-07-03 11:43:01.000000000 +0200
-+++ ../people/mgoetze/simple/debconf/FAIBASE	1970-01-01 01:00:00.000000000 +0100
+Index: examples/simple/debconf/FAIBASE
+===================================================================
+--- examples/simple/debconf/FAIBASE
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,9 +0,0 @@
 -passwd passwd/shadow boolean true
 -exim4-config exim4/dc_eximconfig_configtype select local delivery only; not on a network
@@ -49,9 +52,10 @@
 -xserver-xorg    xserver-xorg/autodetect_keyboard        boolean true
 -xserver-xorg    xserver-xorg/autodetect_mouse           boolean true
 -xserver-xorg    xserver-xorg/autodetect_video_card      boolean true
-diff -urN -x .svn examples/simple/debconf/XORG ../people/mgoetze/simple/debconf/XORG
---- examples/simple/debconf/XORG	1970-01-01 01:00:00.000000000 +0100
-+++ ../people/mgoetze/simple/debconf/XORG	2010-07-04 11:52:15.000000000 +0200
+Index: examples/simple/debconf/XORG
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ examples/simple/debconf/XORG	
 @@ -0,0 +1,6 @@
 +xserver-xorg xserver-xorg/config/inputdevice/keyboard/model string pc105
 +xserver-xorg    xserver-xorg/autodetect_monitor         boolean false
@@ -59,9 +63,10 @@
 +xserver-xorg    xserver-xorg/autodetect_mouse           boolean true
 +xserver-xorg    xserver-xorg/autodetect_video_card      boolean true
 +
-diff -urN -x .svn examples/simple/files/boot/grub/menu.lst/DEBIAN ../people/mgoetze/simple/files/boot/grub/menu.lst/DEBIAN
---- examples/simple/files/boot/grub/menu.lst/DEBIAN	1970-01-01 01:00:00.000000000 +0100
-+++ ../people/mgoetze/simple/files/boot/grub/menu.lst/DEBIAN	2010-07-04 11:55:17.000000000 +0200
+Index: examples/simple/files/boot/grub/menu.lst/DEBIAN
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ examples/simple/files/boot/grub/menu.lst/DEBIAN	
 @@ -0,0 +1,43 @@
 +#
 +timeout 5
@@ -76,7 +81,7 @@
 +
 +## ## Start Default Options ##
 +## default kernel options
-+# kopt=root=#ROOT_PARTITION# ro 
++# kopt=root=#ROOT_PARTITION# ro
 +
 +## default grub root device
 +## e.g. groot=(hd0,0)
@@ -106,9 +111,10 @@
 +### END DEBIAN AUTOMAGIC KERNELS LIST
 +
 +
-diff -urN -x .svn examples/simple/files/boot/grub/menu.lst/GRUB ../people/mgoetze/simple/files/boot/grub/menu.lst/GRUB
---- examples/simple/files/boot/grub/menu.lst/GRUB	2010-07-03 11:43:01.000000000 +0200
-+++ ../people/mgoetze/simple/files/boot/grub/menu.lst/GRUB	1970-01-01 01:00:00.000000000 +0100
+Index: examples/simple/files/boot/grub/menu.lst/GRUB
+===================================================================
+--- examples/simple/files/boot/grub/menu.lst/GRUB
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,43 +0,0 @@
 -#
 -timeout 5
@@ -153,41 +159,46 @@
 -### END DEBIAN AUTOMAGIC KERNELS LIST
 -
 -
-diff -urN -x .svn examples/simple/files/etc/kernel-img.conf/DEBIAN ../people/mgoetze/simple/files/etc/kernel-img.conf/DEBIAN
---- examples/simple/files/etc/kernel-img.conf/DEBIAN	1970-01-01 01:00:00.000000000 +0100
-+++ ../people/mgoetze/simple/files/etc/kernel-img.conf/DEBIAN	2010-07-04 11:55:42.000000000 +0200
+Index: examples/simple/files/etc/kernel-img.conf/DEBIAN
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ examples/simple/files/etc/kernel-img.conf/DEBIAN	
 @@ -0,0 +1,5 @@
 +do_symlinks = Yes
 +do_initrd = Yes
 +silent_modules=yes
 +clobber_modules=yes
 +do_boot_enable=no
-diff -urN -x .svn examples/simple/files/etc/kernel-img.conf/DEFAULT ../people/mgoetze/simple/files/etc/kernel-img.conf/DEFAULT
---- examples/simple/files/etc/kernel-img.conf/DEFAULT	2010-07-03 11:43:02.000000000 +0200
-+++ ../people/mgoetze/simple/files/etc/kernel-img.conf/DEFAULT	1970-01-01 01:00:00.000000000 +0100
+Index: examples/simple/files/etc/kernel-img.conf/DEFAULT
+===================================================================
+--- examples/simple/files/etc/kernel-img.conf/DEFAULT
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,5 +0,0 @@
 -do_symlinks = Yes
 -do_initrd = Yes
 -silent_modules=yes
 -clobber_modules=yes
 -do_boot_enable=no
-diff -urN -x .svn examples/simple/hooks/instsoft.DEBIAN ../people/mgoetze/simple/hooks/instsoft.DEBIAN
---- examples/simple/hooks/instsoft.DEBIAN	1970-01-01 01:00:00.000000000 +0100
-+++ ../people/mgoetze/simple/hooks/instsoft.DEBIAN	2010-07-04 11:53:54.000000000 +0200
+Index: examples/simple/hooks/instsoft.DEBIAN
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ examples/simple/hooks/instsoft.DEBIAN	
 @@ -0,0 +1,3 @@
 +#! /bin/bash
 +
 +[ -s $target/etc/kernel-img.conf ] || fcopy -Bi /etc/kernel-img.conf
-diff -urN -x .svn examples/simple/hooks/instsoft.FAIBASE ../people/mgoetze/simple/hooks/instsoft.FAIBASE
---- examples/simple/hooks/instsoft.FAIBASE	2010-07-03 11:43:02.000000000 +0200
-+++ ../people/mgoetze/simple/hooks/instsoft.FAIBASE	1970-01-01 01:00:00.000000000 +0100
+Index: examples/simple/hooks/instsoft.FAIBASE
+===================================================================
+--- examples/simple/hooks/instsoft.FAIBASE
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,3 +0,0 @@
 -#! /bin/bash
 -
 -[ -s $target/etc/kernel-img.conf ] || fcopy -Bi /etc/kernel-img.conf
-diff -urN -x .svn examples/simple/package_config/DEBIAN ../people/mgoetze/simple/package_config/DEBIAN
---- examples/simple/package_config/DEBIAN	1970-01-01 01:00:00.000000000 +0100
-+++ ../people/mgoetze/simple/package_config/DEBIAN	2010-07-04 11:56:07.000000000 +0200
+Index: examples/simple/package_config/DEBIAN
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ examples/simple/package_config/DEBIAN	
 @@ -0,0 +1,26 @@
 +PACKAGES aptitude I386
 +linux-image-486
@@ -215,9 +226,10 @@
 +
 +PACKAGES aptitude LILO
 +lilo grub-
-diff -urN -x .svn examples/simple/package_config/DEFAULT ../people/mgoetze/simple/package_config/DEFAULT
---- examples/simple/package_config/DEFAULT	2010-07-03 11:43:01.000000000 +0200
-+++ ../people/mgoetze/simple/package_config/DEFAULT	1970-01-01 01:00:00.000000000 +0100
+Index: examples/simple/package_config/DEFAULT
+===================================================================
+--- examples/simple/package_config/DEFAULT
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,26 +0,0 @@
 -PACKAGES aptitude I386
 -linux-image-486
@@ -245,36 +257,20 @@
 -
 -PACKAGES aptitude LILO
 -lilo grub-
-diff -urN -x .svn examples/simple/package_config/FAIBASE ../people/mgoetze/simple/package_config/FAIBASE
---- examples/simple/package_config/FAIBASE	2010-07-03 11:43:01.000000000 +0200
-+++ ../people/mgoetze/simple/package_config/FAIBASE	2010-07-04 11:56:32.000000000 +0200
+Index: examples/simple/package_config/FAIBASE
+===================================================================
+--- examples/simple/package_config/FAIBASE.orig
++++ examples/simple/package_config/FAIBASE	
 @@ -1,4 +1,4 @@
 -PACKAGES aptitude
 +PACKAGES aptitude DEBIAN
  fai-client
  cfengine2
  cron
-diff -urN -x .svn examples/simple/scripts/AMD64/99-discover-bug ../people/mgoetze/simple/scripts/AMD64/99-discover-bug
---- examples/simple/scripts/AMD64/99-discover-bug	2010-07-03 11:43:02.000000000 +0200
-+++ ../people/mgoetze/simple/scripts/AMD64/99-discover-bug	1970-01-01 01:00:00.000000000 +0100
-@@ -1,14 +0,0 @@
--#! /usr/sbin/cfagent -f
--
--# this is a workaround for bug #343338
--
--control:
--   any::
--   actionsequence = ( editfiles )
--   EditFileSize = ( 30000 )
--
--editfiles:
--   any::
--	{ ${target}/etc/discover-modprobe.conf
--	  ReplaceAll "^types=.*" With "types="
--	}
-diff -urN -x .svn examples/simple/scripts/DEBIAN/10-keymap ../people/mgoetze/simple/scripts/DEBIAN/10-keymap
---- examples/simple/scripts/DEBIAN/10-keymap	1970-01-01 01:00:00.000000000 +0100
-+++ ../people/mgoetze/simple/scripts/DEBIAN/10-keymap	2010-07-04 12:00:59.000000000 +0200
+Index: examples/simple/scripts/DEBIAN/10-keymap
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ examples/simple/scripts/DEBIAN/10-keymap	
 @@ -0,0 +1,13 @@
 +#! /bin/bash
 +
@@ -289,9 +285,10 @@
 +
 +exit $error
 +
-diff -urN -x .svn examples/simple/scripts/DEBIAN/10-rootpw ../people/mgoetze/simple/scripts/DEBIAN/10-rootpw
---- examples/simple/scripts/DEBIAN/10-rootpw	1970-01-01 01:00:00.000000000 +0100
-+++ ../people/mgoetze/simple/scripts/DEBIAN/10-rootpw	2010-07-04 12:00:59.000000000 +0200
+Index: examples/simple/scripts/DEBIAN/10-rootpw
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ examples/simple/scripts/DEBIAN/10-rootpw	
 @@ -0,0 +1,12 @@
 +#! /bin/bash
 +
@@ -305,9 +302,10 @@
 +
 +exit $error
 +
-diff -urN -x .svn examples/simple/scripts/DEBIAN/30-interface ../people/mgoetze/simple/scripts/DEBIAN/30-interface
---- examples/simple/scripts/DEBIAN/30-interface	1970-01-01 01:00:00.000000000 +0100
-+++ ../people/mgoetze/simple/scripts/DEBIAN/30-interface	2010-07-04 11:59:37.000000000 +0200
+Index: examples/simple/scripts/DEBIAN/30-interface
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ examples/simple/scripts/DEBIAN/30-interface	
 @@ -0,0 +1,33 @@
 +#! /bin/bash
 +
@@ -337,14 +335,15 @@
 +fi
 +
 +# here fcopy is mostly used, when installing a client for running in a
-+# different subnet than during the installation  
++# different subnet than during the installation
 +fcopy -i /etc/resolv.conf
 +fcopy -iM /etc/network/interfaces /etc/networks
 +
 +exit $error
-diff -urN -x .svn examples/simple/scripts/DEBIAN/40-misc ../people/mgoetze/simple/scripts/DEBIAN/40-misc
---- examples/simple/scripts/DEBIAN/40-misc	1970-01-01 01:00:00.000000000 +0100
-+++ ../people/mgoetze/simple/scripts/DEBIAN/40-misc	2010-07-04 11:59:58.000000000 +0200
+Index: examples/simple/scripts/DEBIAN/40-misc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ examples/simple/scripts/DEBIAN/40-misc	
 @@ -0,0 +1,26 @@
 +#! /usr/sbin/cfagent -f
 +
@@ -372,9 +371,10 @@
 +	  ReplaceAll "/sbin/getty 38400"
 +		With "/sbin/getty -f /etc/issue.linuxlogo 38400"
 +	}
-diff -urN -x .svn examples/simple/scripts/FAIBASE/10-misc ../people/mgoetze/simple/scripts/FAIBASE/10-misc
---- examples/simple/scripts/FAIBASE/10-misc	2010-07-03 11:43:02.000000000 +0200
-+++ ../people/mgoetze/simple/scripts/FAIBASE/10-misc	2010-07-04 12:02:15.000000000 +0200
+Index: examples/simple/scripts/FAIBASE/10-misc
+===================================================================
+--- examples/simple/scripts/FAIBASE/10-misc.orig
++++ examples/simple/scripts/FAIBASE/10-misc	
 @@ -1,6 +1,7 @@
  #! /bin/bash
  
@@ -383,13 +383,13 @@
  
  error=0 ; trap "error=$((error|1))" ERR
  
-@@ -16,18 +17,10 @@
+@@ -20,18 +21,10 @@
  
  fcopy -iM /etc/hosts /etc/motd
  
 -# set root password
 -#echo "root:$ROOTPW" | $ROOTCMD chpasswd --encrypted
--$ROOTCMD usermod -p $ROOTPW root
+-$ROOTCMD usermod -p "$ROOTPW" root
  # make /root accessible only by root
  chmod 0700 $target/root
  chown root:root $target/root
@@ -402,9 +402,10 @@
 -# dumpkeys | gzip -9f >$target/etc/console/boottime.kmap.gz
 -
  exit $error
-diff -urN -x .svn examples/simple/scripts/FAIBASE/30-interface ../people/mgoetze/simple/scripts/FAIBASE/30-interface
---- examples/simple/scripts/FAIBASE/30-interface	2010-07-03 11:43:02.000000000 +0200
-+++ ../people/mgoetze/simple/scripts/FAIBASE/30-interface	1970-01-01 01:00:00.000000000 +0100
+Index: examples/simple/scripts/FAIBASE/30-interface
+===================================================================
+--- examples/simple/scripts/FAIBASE/30-interface
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,33 +0,0 @@
 -#! /bin/bash
 -
@@ -439,33 +440,3 @@
 -fcopy -iM /etc/network/interfaces /etc/networks
 -
 -exit $error
-diff -urN -x .svn examples/simple/scripts/FAIBASE/40-misc ../people/mgoetze/simple/scripts/FAIBASE/40-misc
---- examples/simple/scripts/FAIBASE/40-misc	2010-07-03 11:43:02.000000000 +0200
-+++ ../people/mgoetze/simple/scripts/FAIBASE/40-misc	1970-01-01 01:00:00.000000000 +0100
-@@ -1,26 +0,0 @@
--#! /usr/sbin/cfagent -f
--
--control:
--   any::
--   actionsequence = ( directories editfiles )
--   EditFileSize = ( 30000 )
--
--directories:
--   any::
--	${target}/tmp mode=1777 owner=0 group=0
--
--editfiles:
--   any::
--	{ ${target}/etc/mailname
--	  AutoCreate
--          AppendIfNoSuchLine "${HOSTNAME}"
--	}
--
--	{ ${target}/etc/default/rcS
--	  ReplaceAll "^UTC=.*" With "UTC=${UTC}"
--	}
--
--	{ ${target}/etc/inittab
--	  ReplaceAll "/sbin/getty 38400"
--		With "/sbin/getty -f /etc/issue.linuxlogo 38400"
--	}

More information about the Fai-commit mailing list