Merge branch 'master' into febootstrap

2026-01-21 17:55:25 +00:00 · 2010-05-17 23:22:56 +02:00 · 2010-05-17 23:22:56 +02:00 · ce0fd617a5
commit ce0fd617a5
parent c151721271 8634cda1ee
2 changed files with 9 additions and 3 deletions
--- a/10
+++ b/10
@ -53,6 +53,10 @@ Contributions
  Gordon Messmer <gmessmer [at] edu.washington.u>
   - Supplied .spec file for building .rpm packages.

+  Wilson Neil <neil [at] uk.co.aldur>
+   - Several suggestions and code for disabling start-stop-daemon
+   - Compatibility fixups for Ubuntu.
+
  Nathan O'Sullivan <nathan [at] au.com.mammoth>
   - New features wrt. options and helper functions

@ -62,6 +66,9 @@ Contributions
  Jameson Rollins <jrollins [at] edu.columbia.phys>
   - Provided --output + --extension code.

+  Michal Safranek (Wejn) <wejn [at] box.cz>
+   - Inspiration for pygrub in the install-kernel scripts
+
  Felipe Scarel <fbscarel [at] com.gmail>
   - Bugfix for --no-swap + LVM

@ -81,6 +88,3 @@ Contributions
  Ward Vandewege <ward [at] be.pong>
   - Made several updates for Ubuntu support.

-  Wilson Neil <neil [at] uk.co.aldur>
-   - Several suggestions and code for disabling start-stop-daemon
-   - Compatibility fixups for Ubuntu.
--- a/2
+++ b/2
@ -69,6 +69,8 @@ Bugs to fix and Features to add before a 4.2 release

 - Clean up setup-hostname - copying the dom0s /etc/hosts isn't reliable

+- Add a flag to not copy /etc/hosts file
+
 - Setup locales in the hooks?