diff --git a/operation/configure_bootloader_cnf.sh b/operation/configure_bootloader_cnf.sh
index ff9285c..51cd093 100755
--- a/operation/configure_bootloader_cnf.sh
+++ b/operation/configure_bootloader_cnf.sh
@@ -128,24 +128,43 @@ EOF
fi
info "root_dev: $root_dev"
- # modify grub.conf.sample from here
- # modify root
- sed "/^splashimage / s/(hd0,0)/$root/
- /^kernel / s/(hd0,0)/$root/" "$GRUBCNF" >"$GRUBMENU"
-
- # modify boot directory
- # boot directory mount stand alone
+ local boot
if [ -n "$BOOT_PARTITION" ];then
- sed -i "/^kernel / s@/boot@@
- /^initrd / s@/boot@@" "$GRUBMENU"
+ boot=
+ else
+ boot="boot"
fi
+cat >>"$TMPGRUBMENU"<< EOF
+## LINX splash image
+splashimage $root/boot/grub/linx.xpm.gz
- # modify OS version
- sed -i "/^title / s/Secure System/Secure Operating System Version $OSVERSION/" "$GRUBMENU"
- # modify root partition
- sed -i "/^kernel / s@root=/dev/hda1@root=$root_dev@" "$GRUBMENU"
- # append kernel parameter
- sed -i "s/^kernel .*$/& $KPARAMETER/g" $GRUBMENU
+## define special fore-/background colors for splash screen image
+foreground = FFFFFF
+background = AAAAAA
+
+## time to wait for user interaction
+timeout 10
+
+## default boot kernel
+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
+
+title LINX Rocky Secure Operating System Version $OSVERSION without root
+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
+
+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
+EOF
}
main ()
@@ -229,6 +248,7 @@ 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"
diff --git a/operation/install_pkg.sh b/operation/install_pkg.sh
index 6ba0d4d..6675a41 100755
--- a/operation/install_pkg.sh
+++ b/operation/install_pkg.sh
@@ -87,6 +87,8 @@ get_pkg_file ()
# get the first package if have multi-package in source directory
if [ -e "$PKG_SOURCE_DIR"/"$pkgname"'#'*tar.gz ]; then
ls "$PKG_SOURCE_DIR"/"$pkgname"'#'*tar.gz|head -n 1
+ elif [ -e "/Rocky/install_lib_32/pkg_lib_i686"/"$pkgname"'#'*tar.gz ]; then
+ ls "/Rocky/install_lib_32/pkg_lib_i686"/"$pkgname"'#'*tar.gz|head -n 1
else
err "package \"$pkgname\" doesn't exist in "$PKG_SOURCE_DIR" "
return 3
@@ -142,7 +144,6 @@ main ()
local line
local tmp
local pkgname
-
tmp=$(getopt -o s: --long source:,help -- "$@" 2>>$DEV_LOG)
if [ $? -ne 0 ];then
usage; erv
diff --git a/operation/makeinitrd b/operation/makeinitrd
index 95617bc..06e2a5c 100755
--- a/operation/makeinitrd
+++ b/operation/makeinitrd
@@ -2,6 +2,15 @@
source ./functions
-modules=$(ls /Rocky/modules/|grep -v .bak|grep -v .old)
-LOGFILE=$LOG_FILE mkTmpfstab.sh -f "$TARGET/etc/fstab" -t "/tmp/fstab"
-mkinitrd "$TARGET"/boot/initrd.gz $modules --without-usb --without-multipath --fstab="/tmp/fstab" -f
+modules=$(ls /Rocky/modules/)
+for module in $modules
+do
+ nocgroup=${module##*-}
+ if [ "$nocgroup" == `uname -m` ];then
+ initrd="initrd.gz"
+ else
+ initrd="initrd-$nocgroup.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
+done
diff --git a/xml/D5000-server.xml b/xml/D5000-server.xml
index 9d6abab..aefbb90 100644
--- a/xml/D5000-server.xml
+++ b/xml/D5000-server.xml
@@ -163,6 +163,8 @@
+
+
@@ -222,7 +224,6 @@
-
@@ -455,7 +456,6 @@
-
@@ -576,6 +576,7 @@
+
@@ -676,7 +677,6 @@ group name='development'>
-
@@ -786,7 +786,6 @@ group name='development'>
-
diff --git a/xml/D5000-workstation.xml b/xml/D5000-workstation.xml
index 5153fd5..7719fc5 100644
--- a/xml/D5000-workstation.xml
+++ b/xml/D5000-workstation.xml
@@ -266,6 +266,8 @@
+
+
@@ -645,7 +647,6 @@
-
@@ -874,6 +875,7 @@
+
@@ -1219,7 +1221,6 @@ group name='development'>
-
diff --git a/xml/server.xml b/xml/config.xml
similarity index 52%
rename from xml/server.xml
rename to xml/config.xml
index 4e90db8..57b10c0 100644
--- a/xml/server.xml
+++ b/xml/config.xml
@@ -4,7 +4,9 @@
+
+
@@ -12,6 +14,11 @@
+
+
+ xml processor for Python
+
+
@@ -25,25 +32,41 @@
+
+
+
+
+
+ TLS is an OpenSSL / RSA-bsafe Tcl extension that provides secure connections on top of the Tcl socket mechanism.
+
+
+
+
+
+
+
+
+
+
@@ -51,31 +74,51 @@
+
+
+
+
+
+
+
+
+
+
+ Clock scaling userspace tools
+
+
+
+
+
+ Cscope is a developer's tool for browsing source code.
+
+
+
@@ -83,8 +126,11 @@
+
+
+
@@ -94,6 +140,7 @@
+
@@ -101,12 +148,15 @@
+
+
+
@@ -116,27 +166,47 @@
+
+
+
+
+
+
+
+
+
+ git, fast version control system
+
+
+
+
+ git manpages
+
+
+
+
+
@@ -146,10 +216,19 @@
+
+
+
+ GNU privacy guard version 1.4.x
+
+
+
+
+
@@ -157,21 +236,31 @@
+
+
+
+
+
+
+
+
+
+
@@ -179,59 +268,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -243,12 +362,15 @@
+
+
+
@@ -278,9 +400,11 @@
+
+
@@ -340,6 +464,7 @@
+
@@ -349,6 +474,7 @@
+
@@ -364,11 +490,14 @@
+
+
+
@@ -391,9 +520,13 @@
+
+
+
+
@@ -411,12 +544,17 @@
+
+
+
+
+
@@ -426,16 +564,21 @@
+
+
+
+
+
@@ -461,6 +604,14 @@
+
+
+ email client from the Mozilla project
+
+
+
+
+
@@ -473,6 +624,7 @@
+
@@ -480,6 +632,7 @@
+
@@ -497,6 +650,7 @@
+
@@ -504,62 +658,123 @@
+
+
+ Wireshark is an award-winning network protocol analyzer.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -585,6 +800,7 @@
+
@@ -623,6 +839,7 @@
+
@@ -709,13 +926,35 @@
开发类包括 C、C++(Fortran)、DDD 等开发工具。
开发类软件包分为必选包和可选包,当选择安装该类后,必选包是默认安装的,可选包可以自由选择安装。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -724,10 +963,19 @@
+
+
+
+
+
+
+
+
+
@@ -735,14 +983,98 @@
图形类包括 X11 相关的各种程序。
图形类软件包分为必选包和可选包,当选择安装该类后,必选包是默认安装的,可选包可以自由选择安装。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -750,10 +1082,60 @@
因特网类包括万维网浏览器 Firefox 等。
因特网类软件包都是必选包,当选择安装该类后,必选包是默认安装的。
+
+
+
+
+
+ KDE是一种著名的自由图形工作环境,整个系统采用Qt程序库
+ KDE桌面类都是可选软件包,可以自由选择安装。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 多媒体类包括各种媒体库。
+ 多媒体类都是可选软件包,可以自由选择安装。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -762,11 +1144,15 @@
+
+
+
+
@@ -784,6 +1170,9 @@
+
+
+
@@ -794,17 +1183,47 @@
+
+
+
+ 办公类包括 OpenOffice.org 等办公软件。
+ 办公类都是必选软件包,当选择安装该类后,必选包是默认安装的。
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 通过软件模拟的具有完整硬件系统功能的、运行在一个完全隔离环境中的完整计算机系统
+ 虚拟机类都是可选软件包,可以自由选择安装
+
+
+
+
+
+
+
+
+
+
diff --git a/xml/dependency.xml b/xml/dependency.xml
index b0bf768..ee00049 100644
--- a/xml/dependency.xml
+++ b/xml/dependency.xml
@@ -595,7 +595,6 @@
-
@@ -1832,6 +1831,7 @@
+
@@ -2005,6 +2005,7 @@
+
@@ -4171,16 +4172,25 @@
+
+
+
+
+
+
+
+
+
@@ -4324,6 +4334,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5396,16 +5435,22 @@
+
+
+
+
+
+
@@ -5431,6 +5476,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5465,11 +5528,20 @@
+
+
+
+
+
+
+
+
+
@@ -5567,11 +5639,20 @@
+
+
+
+
+
+
+
+
+
@@ -5587,11 +5668,20 @@
+
+
+
+
+
+
+
+
+
@@ -5607,10 +5697,19 @@
+
+
+
+
+
+
+
+
+