anaconda: comps.awk comps.xml

[glen]

Author: glen
Date: Wed Aug 30 21:24:31 2006
New Revision: 7691

Modified:
   anaconda/comps.awk
   anaconda/comps.xml
Log:
- first choice takes into account optional or default,
  rest of the items in the group are always optional.



Modified: anaconda/comps.awk
==============================================================================
--- anaconda/comps.awk	(original)
+++ anaconda/comps.awk	Wed Aug 30 21:24:31 2006
@@ -70,8 +70,11 @@
         }
 
         n = split(pkgs, pkga, / /);
-        for (i = 1; i <= n; i++) {
-            printf "\t\t\t<packagereq type=\"%s\">%s</packagereq>\n", type, pkga[i]
+		# first choice takes into account optional or default,
+		# rest of the items in the group are always optional.
+		printf "\t\t\t<packagereq type=\"%s\">%s</packagereq>\n", type, pkga[1]
+        for (i = 2; i <= n; i++) {
+            printf "\t\t\t<packagereq type=\"%s\">%s</packagereq>\n", "optional", pkga[i]
         }
 
     }

Modified: anaconda/comps.xml
==============================================================================
--- anaconda/comps.xml	(original)
+++ anaconda/comps.xml	Wed Aug 30 21:24:31 2006
@@ -9,15 +9,15 @@
 		<description>Base packages</description>
 		<packagelist>
 			<packagereq type="default">syslog-ng</packagereq>
-			<packagereq type="default">syslog</packagereq>
+			<packagereq type="optional">syslog</packagereq>
 			<packagereq type="default">lilo</packagereq>
-			<packagereq type="default">grub</packagereq>
+			<packagereq type="optional">grub</packagereq>
 			<packagereq type="default">vixie-cron</packagereq>
-			<packagereq type="default">hc-cron</packagereq>
-			<packagereq type="default">anacron</packagereq>
+			<packagereq type="optional">hc-cron</packagereq>
+			<packagereq type="optional">anacron</packagereq>
 			<packagereq type="default">rdate</packagereq>
-			<packagereq type="default">rdate-bsd</packagereq>
-			<packagereq type="default">ntp-client</packagereq>
+			<packagereq type="optional">rdate-bsd</packagereq>
+			<packagereq type="optional">ntp-client</packagereq>
 			<packagereq type="default">FHS</packagereq>
 			<packagereq type="default">SysVinit</packagereq>
 			<packagereq type="default">basesystem</packagereq>
@@ -675,7 +675,7 @@
 		<description>Packages for (de)compressing using strange formats</description>
 		<packagelist>
 			<packagereq type="default">zip</packagereq>
-			<packagereq type="default">unzip</packagereq>
+			<packagereq type="optional">unzip</packagereq>
 			<packagereq type="default">unace</packagereq>
 			<packagereq type="default">unrar</packagereq>
 			<packagereq type="default">unarj</packagereq>