From 07d9e3442c31f98c581ba6cbc7f8099d6e815425 Mon Sep 17 00:00:00 2001
From: Fabian Arrotin <arrfab@centos.org>
Date: Jul 27 2011 10:11:14 +0000
Subject: Merge branch 'master' of ssh://nazar.karan.org/c6/c6-comps


---

diff --git a/c6-minimal-i386-RPMS.lst b/c6-minimal-i386-RPMS.lst
index ac34c41..00eb674 100644
--- a/c6-minimal-i386-RPMS.lst
+++ b/c6-minimal-i386-RPMS.lst
@@ -26,6 +26,8 @@
 |cpio.i686|
 |cracklib-dicts.i686|
 |cracklib.i686|
+|cryptsetup-luks.i686|
+|cryptsetup-luks-libs.i686|
 |curl.i686|
 |cyrus-sasl-lib.i686|
 |dash.i686|
@@ -115,6 +117,7 @@
 |lvm2-libs.i686|
 |m4.i686|
 |MAKEDEV.i686|
+|mdadm.i686|
 |mingetty.i686|
 |module-init-tools.i686|
 |ncurses-base.i686|
diff --git a/c6-minimal-i386.xml b/c6-minimal-i386.xml
index 234e81b..09aa193 100644
--- a/c6-minimal-i386.xml
+++ b/c6-minimal-i386.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE comps PUBLIC "-//CentOS//DTD Comps info//EN" "comps.dtd">
 <comps>
   <group>
-    <id>minimal</id>
+    <id>core</id>
+    <name>Core</name>
  <description/>
     <default>true</default>
     <uservisible>false</uservisible>
@@ -28,6 +29,7 @@
      <packagereq type='mandatory'>cpio</packagereq>
      <packagereq type='mandatory'>cracklib</packagereq>
      <packagereq type='mandatory'>cracklib-dicts</packagereq>
+     <packagereq type='mandatory'>cryptsetup-luks</packagereq>
      <packagereq type='mandatory'>curl</packagereq>
      <packagereq type='mandatory'>cyrus-sasl-lib</packagereq>
      <packagereq type='mandatory'>dash</packagereq>
@@ -196,14 +198,12 @@
   </group>
 
 <category>
-    <id>minimal</id>
-    <name>Minimal</name>
+    <id>core</id>
+    <name>Core</name>
     <description>Minimal server packages set</description>
     <display_order>60</display_order>
     <grouplist>
-      <groupid>minimal</groupid>
+      <groupid>core</groupid>
     </grouplist>
   </category>
-
-
 </comps>
diff --git a/c6-minimal-x86_64-RPMS.lst b/c6-minimal-x86_64-RPMS.lst
index 5a48a87..5881d16 100644
--- a/c6-minimal-x86_64-RPMS.lst
+++ b/c6-minimal-x86_64-RPMS.lst
@@ -26,6 +26,8 @@
 |cpio.x86_64|
 |cracklib-dicts.x86_64|
 |cracklib.x86_64|
+|cryptsetup-luks.x86_64|
+|cryptsetup-luks-libs.x86_64|
 |curl.x86_64|
 |cyrus-sasl-lib.x86_64|
 |dash.x86_64|
@@ -115,6 +117,7 @@
 |lvm2.x86_64|
 |m4.x86_64|
 |MAKEDEV.x86_64|
+|mdadm.x86_64|
 |mingetty.x86_64|
 |module-init-tools.x86_64|
 |ncurses-base.x86_64|