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
This commit is contained in:
Peng Zhihui
2013-04-07 11:08:52 +08:00
parent 095c866bc2
commit 1666ccbe3a
3 changed files with 11 additions and 8 deletions

View File

@@ -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 ()

View File

@@ -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