[Fai-commit] r6451 - branches/stable/3.4/examples/simple/package_config

Michael Prokop mika at alioth.debian.org
Fri Apr 15 18:52:31 UTC 2011


Author: mika
Date: 2011-04-15 18:52:29 +0000 (Fri, 15 Apr 2011)
New Revision: 6451

Modified:
   branches/stable/3.4/examples/simple/package_config/FAISERVER
Log:
package_config/FAISERVER: remove mkisofs

(cherry picked from commit f4fa78181de87737c39df7c0c145273b085f2ae8)

Conflicts:

	3.4/examples/simple/package_config/FAISERVER

Merge conflict resolved by Michael Prokop <mika at grml.org>.

From: Michael Goetze <mgoetze at mgoetze.net>

Modified: branches/stable/3.4/examples/simple/package_config/FAISERVER
===================================================================
--- branches/stable/3.4/examples/simple/package_config/FAISERVER	2011-04-15 18:25:52 UTC (rev 6450)
+++ branches/stable/3.4/examples/simple/package_config/FAISERVER	2011-04-15 18:52:29 UTC (rev 6451)
@@ -4,6 +4,6 @@
 dhcp-client
 debmirror tcpdump
 apache2
-genisoimage mkisofs grub
+genisoimage grub
 approx lftp
 syslinux-common




More information about the Fai-commit mailing list