bug# 1216

use "full" initrd.gz instead of initrd.gz which make by mkinitrd.
	modified:   configure_bootloader_cnf.sh
	modified:   copy_kernels.sh
This commit is contained in:
Qin Bo
2012-08-27 16:02:35 +08:00
parent 25f3ed4779
commit a9d1747e04
2 changed files with 5 additions and 12 deletions

View File

@@ -155,11 +155,11 @@ initrd $boot/initrd.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-nocgroup.gz
initrd $boot/initrd.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-nocgroup.gz
initrd $boot/initrd.gz
EOF
}

View File

@@ -49,11 +49,11 @@ main ()
exit 1
fi
info "copy $INITRD/initrd-full.gz to $TARGET/boot/initrd-full.gz"
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-full.gz" 2>>$DEV_LOG
cp "$INITRD/initrd-full.gz" "$TARGET/boot/initrd.gz" 2>>$DEV_LOG
else
err "$INITRD/initrd.gz doesn't exist "
err "$INITRD/initrd-full.gz doesn't exist "
exit 1
fi
@@ -62,13 +62,6 @@ main ()
cp -r "$FIRMWARE" $TARGET/lib/
fi
info "runing makeinitrd"
if [ -e ./makeinitrd ];then
./makeinitrd 2>>$DEV_LOG
else
err "makeinitrd doesn't exist "
exit 1
fi
;;
ia64)
info "copy $KERNELS/* to /tmp/tmppoint"