linx/new_install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust

Browse Source 
modified:   operation/configure_bootloader_cnf.sh
	modified:   operation/makeinitrd

	modified:   operation/configure_bootloader_cnf.sh
	modified:   operation/makeinitrd
	modified:   xml/D5000-workstation.xml
This commit is contained in:
fling
2011-07-19 09:21:54 +08:00
parent d12ff2ddb2
commit 3b4ed215c1
3 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
operation/configure_bootloader_cnf.sh
View File

@@ -85,10 +85,6 @@ configure_grub_cnf ()
local devname
local root_dev
if [ ! -e "$GRUBCNF" ];then
err "$GRUBCNF doesn't exist"
return 4
fi
# get the boot directory in which hard disk
if [ -n "$BOOT_PARTITION" ];then
@@ -132,9 +128,9 @@ EOF
if [ -n "$BOOT_PARTITION" ];then
boot=
else
boot="boot"
boot="/boot"
fi
cat >>"$TMPGRUBMENU"<< EOF
cat >>"$GRUBMENU"<< EOF
## LINX splash image
splashimage $root/boot/grub/linx.xpm.gz
@@ -150,20 +146,20 @@ default 0
## Default menu entries
title LINX Rocky Secure Operating System Version $OSVERSION with root
kernel $root/$boot/vmlinuz-root root=$root_dev $KPARAMETER
initrd /$boot/initrd.gz
kernel $root$boot/vmlinuz-root root=$root_dev $KPARAMETER
initrd $boot/initrd.gz
title LINX Rocky Secure Operating System Version $OSVERSION without root
kernel $root/$boot/vmlinuz-root-n root=$root_dev $KPARAMETER
initrd /$boot/initrd.gz
kernel $root$boot/vmlinuz-root-n root=$root_dev $KPARAMETER
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
initrd /$boot/initrd-nocgroup.gz
kernel $root$boot/vmlinuz-root-nocgroup root=$root_dev $KPARAMETER
initrd $boot/initrd-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
initrd /$boot/initrd-nocgroup.gz
kernel $root$boot/vmlinuz-root-n-nocgroup root=$root_dev $KPARAMETER
initrd $boot/initrd-nocgroup.gz
EOF
}
@@ -248,8 +244,6 @@ KPARAMETER=""
OSVERSION=""
GRUB_DIR="$TARGET/boot/grub"
GRUBMENU="$GRUB_DIR/menu.lst"
TMPGRUBMENU="$GRUB_DIR/tmpmenu.lst"
GRUBCNF="$GRUB_DIR/grub.conf.sample"
DEVICEMAP="$GRUB_DIR/device.map"
ELILO_CNF="/tmp/tmppoint/efi/boot/elilo.conf"

8
operation/makeinitrd
View File

@@ -5,11 +5,11 @@ source ./functions
modules=$(ls /Rocky/modules/)
for module in $modules
do
nocgroup=${module##*-}
if [ "$nocgroup" == `uname -m` ];then
version=${module##*-}
if [ "$version" == `uname -m` ];then
initrd="initrd.gz"
else
initrd="initrd-$nocgroup.gz"
elif [ "$version" == "nocgroup" ];then
initrd="initrd-$version.gz"
fi
LOGFILE=$LOG_FILE mkTmpfstab.sh -f "$TARGET/etc/fstab" -t "/tmp/fstab"
mkinitrd "$TARGET"/boot/$initrd $module --without-usb --without-multipath --fstab="/tmp/fstab" -f

4
xml/D5000-workstation.xml
View File

@@ -756,7 +756,7 @@
<package name='scim-tables_i686_lib'/>
<package name='xorg-x11-xserver_i686_lib'/>
<group name='server'>
<group name='workstation'>
<description>
D5000服务器定制的软件包与32位库
</description>
@@ -1279,7 +1279,7 @@ group name='development'>
<release name='security'>
<including group='server' install='mandatory'/>
<including group='workstation' install='mandatory'/>
</release>
</configuration>