From 1666ccbe3aa20b50c4bfc8f91ed91f507438d185 Mon Sep 17 00:00:00 2001
From: Peng Zhihui <zhihuipeng@linx-info.com>
Date: Sun, 7 Apr 2013 11:08:52 +0800
Subject: [PATCH] add multipath-tools to xml/dependency.xml modify
 operation/copy_kernels.sh to support the cgroup and nocgroup initrd modify
 operation/configure_bootloader_cnf.sh to solve the problem of grub

---
 operation/configure_bootloader_cnf.sh | 9 +++++----
 operation/copy_kernels.sh             | 9 +++++----
 xml/dependency.xml                    | 1 +
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/operation/configure_bootloader_cnf.sh b/operation/configure_bootloader_cnf.sh
index 953f85b..40b1371 100755
--- a/operation/configure_bootloader_cnf.sh
+++ b/operation/configure_bootloader_cnf.sh
@@ -147,20 +147,21 @@ default 0
 ## Default menu entries
 title LINX Rocky Secure Operating System Version $OSVERSION with root 
 kernel $root$boot/vmlinuz-root root=$root_dev $KPARAMETER linx-root
-initrd $boot/initrd.gz
+initrd $boot/initrd-full-cgroup.gz
 
 title LINX Rocky Secure Operating System Version $OSVERSION without root 
 kernel $root$boot/vmlinuz-root-n root=$root_dev $KPARAMETER linx-no-root
-initrd $boot/initrd.gz
+initrd $boot/initrd-full-cgroup.gz
 
 title LINX Rocky Secure Operating System Version $OSVERSION with root but no cgroup 
 kernel $root$boot/vmlinuz-root-nocgroup root=$root_dev $KPARAMETER linx-root-nocgroup
-initrd $boot/initrd.gz
+initrd $boot/initrd-full-nocgroup.gz
 
 title LINX Rocky Secure Operating System Version $OSVERSION without root but no cgroup
 kernel $root$boot/vmlinuz-root-n-nocgroup root=$root_dev $KPARAMETER linx-no-root-nocgroup
-initrd $boot/initrd.gz
+initrd $boot/initrd-full-nocgroup.gz
 EOF
+chown 96.96 $GRUBMENU
 }
 
 main ()
diff --git a/operation/copy_kernels.sh b/operation/copy_kernels.sh
index 6404485..aaed391 100755
--- a/operation/copy_kernels.sh
+++ b/operation/copy_kernels.sh
@@ -49,11 +49,12 @@ main ()
             exit 1
         fi
 
-		info "copy $INITRD/initrd-full.gz to $TARGET/boot/initrd.gz"
-		if [ -e "$INITRD/initrd-full.gz" ];then
-			cp "$INITRD/initrd-full.gz" "$TARGET/boot/initrd.gz" 2>>$DEV_LOG
+		info "copy $INITRD/initrd-full-cgroup.gz to $TARGET/boot/initrd-full-cgroup.gz and copy $INITRD/initrd-full-nocgroup.gz to $TARGET/boot/initrd-full-nocgroup.gz"
+		if [ -e "$INITRD/initrd-full-cgroup.gz" -a -e "$INITRD/initrd-full-nocgroup.gz" ];then
+			cp "$INITRD/initrd-full-cgroup.gz" "$TARGET/boot/initrd-full-cgroup.gz" 2>>$DEV_LOG
+ 		        cp "$INITRD/initrd-full-nocgroup.gz" "$TARGET/boot/initrd-full-nocgroup.gz" 2>>$DEV_LOG
 		else
-			err "$INITRD/initrd-full.gz doesn't exist "
+			err "$INITRD/initrd-full-cgroup.gz or $INITRD/initrd-full-nocgroup.gz doesn't exist "
 			exit 1
 		fi
         
diff --git a/xml/dependency.xml b/xml/dependency.xml
index 3a34bab..0a9a27d 100644
--- a/xml/dependency.xml
+++ b/xml/dependency.xml
@@ -2171,6 +2171,7 @@
       <depending package='apache'/>
     </buildtime>
   </package>
+  <package name='multipath-tools'/>
   <package name='module-init-tools'>
     <runtime>
       <depending via='shared_lib' package='glibc'/>