添加40安装选项及支持700内核的dmraid识别

modified:   main/begin-install
	modified:   operation/finish_install/98state_grid_custom.py
	new file:   operation/finish_install/exec_install_40.sh
	modified:   operation/functions
	new file:   xml/install-40-d5000.xml

Signed-off-by: Xu, Shunxuan <sxxu@linx-info.com>
This commit is contained in:
Xu, Shunxuan
2018-11-06 11:21:34 +08:00
parent c394a6318a
commit e7ef3d5b16
5 changed files with 539 additions and 3 deletions

View File

@@ -12,6 +12,7 @@ work_as_net_inst_server(){
activate_dmraid(){
modprobe dm_mod
/usr/sbin/dmsetup remove_all
dmraid -p -ay
for i in $(dmraid -s -c);do
kpartx -a /dev/mapper/$i
@@ -19,6 +20,7 @@ activate_dmraid(){
}
dmraid=`cat /proc/cmdline | sed 's/.*dmraid=\([^ ]*\).*/\1/'`
os=`cat /proc/cmdline | sed 's/.*os=\([^ ]*\).*/\1/'`
if [ "$(echo $dmraid |tr '[A-Z]' '[a-z]')" = "true" ];then
activate_dmraid
@@ -40,7 +42,11 @@ if [ $instmode = 'Auto' ];then
cp /usr/lib/new_install/xml/install.xml /var/install/install.xml
elif [ $instmode = 'StateGrid' ];then
mkdir -pv /var/install/
cp /usr/lib/new_install/xml/install-d5000.xml /var/install/install.xml
if [ $os = '40' ];then
cp /usr/lib/new_install/xml/install-40-d5000.xml /var/install/install.xml
else
cp /usr/lib/new_install/xml/install-d5000.xml /var/install/install.xml
fi
fi
case $instmode in

View File

@@ -27,6 +27,7 @@ except:
instmode = 'Text'
if instmode == 'StateGrid':
os.system("cp -r /usr/lib/StateGrid /mnt/opt/")
os.system("source /usr/lib/new_install/operation/finish_install/exec_install_40.sh")
os.system("chroot /mnt /opt/StateGrid/setup.sh %s %s %s" %(username, homedir, shell))
os.system("rm -rf /mnt/opt/StateGrid")

View File

@@ -0,0 +1,18 @@
#!/bin/bash
os=`cat /proc/cmdline | sed 's/.*os=\([^ ]*\).*/\1/'`
if [ $os == "40" ];then
# 40 don't set bonding
sed 's/^\.\/set_bonding/\#\.\/set_bonding/g' /mnt/opt/StateGrid/setup.sh > /mnt/opt/StateGrid/setup.sh.bak
mv /mnt/opt/StateGrid/setup.sh.bak /mnt/opt/StateGrid/setup.sh
chmod +x /mnt/opt/StateGrid/setup.sh
# change desktop pic
echo "cp /opt/StateGrid/install_shell/kdesktoprc \$USER_HOME/.kde/share/config/" >> /mnt/opt/StateGrid/install_shell/create_users.sh
echo "cp /opt/StateGrid/install_shell/kdesktoprc \$HOME/.kde/share/config/" >> /mnt/opt/StateGrid/install_shell/create_users.sh
echo "cp /opt/StateGrid/install_shell/kdesktoprc /etc/skel/.kde/share/config/" >> /mnt/opt/StateGrid/install_shell/create_users.sh
echo "chown sys:sys /etc/skel/.kde/share/config/kdesktoprc" >> /mnt/opt/StateGrid/install_shell/create_users.sh
echo "chown \$USER_NAME:\$USER_NAME \$USER_NAME/.kde/share/config" >> /mnt/opt/StateGrid/install_shell/create_users.sh
# change issue
sed 's/6\.0\.42\.41/4\.2\.40/g' /mnt/etc/issue > /mnt/etc/issue.bak
mv /mnt/etc/issue.bak /mnt/etc/issue
fi

View File

@@ -119,7 +119,7 @@ reumount ()
update_udev()
{
killall udevd
start_udev
start_udev 1>/dev/null 2>/dev/null
}
#
@@ -144,7 +144,7 @@ get_disk_sym ()
update_udev
# scsci's by-id may be have multi-links, we get first link
# update hard disk informations.
devname=$(udevinfo -q symlink -p $path|tr " " "\n"|grep "$type"|head -n 1)
devname=$(udevadm info -q symlink -p $path|tr " " "\n"|grep "$type"|head -n 1)
echo "$devname"

511
xml/install-40-d5000.xml Normal file
View File

@@ -0,0 +1,511 @@
<?xml version='1.0' encoding='UTF-8'?>
<install>
<serial-number>0123456789</serial-number>
<network domain='in.linx' configuration='static' ip='192.168.1.109' hostname='localhost' mask='255.255.255.0' primary_dns='192.168.1.1' secondary_dns='' gateway='192.168.1.1'/>
<groups>
<group name='base' install='yes'>
<mandatory>
<package name='less'/>
<package name='iputils'/>
<package name='acpid'/>
<package name='kbd'/>
<package name='sysvinit'/>
<package name='network-scripts'/>
<package name='findutils'/>
<package name='rsyslog'/>
<package name='popt'/>
<package name='gdbm'/>
<package name='shadow'/>
<package name='cpufrequtils'/>
<package name='util-linux'/>
<package name='grub2'/>
<package name='pam_make'/>
<package name='os-prober'/>
<package name='lm_sensors'/>
<package name='iptables'/>
<package name='dep-xml'/>
<package name='unzip'/>
<package name='linux-firmware'/>
<package name='python'/>
<package name='db'/>
<package name='cpio'/>
<package name='rpm2targz'/>
<package name='reiserfsprogs'/>
<package name='liblinxsn'/>
<package name='tcl'/>
<package name='patch'/>
<package name='psmisc'/>
<package name='netkit-telnetd'/>
<package name='net-tools'/>
<package name='help2man'/>
<package name='man-pages'/>
<package name='texi2html'/>
<package name='ports'/>
<package name='pkg-config'/>
<package name='termcap'/>
<package name='parted'/>
<package name='smartmontools'/>
<package name='ed'/>
<package name='dosfstools'/>
<package name='mysql'/>
<package name='adjtimex'/>
<package name='udev'/>
<package name='dialog'/>
<package name='kernel-source'/>
<package name='sed'/>
<package name='expect'/>
<package name='libxslt'/>
<package name='netkit-base'/>
<package name='mktemp'/>
<package name='unrar'/>
<package name='elfutils'/>
<package name='bc'/>
<package name='kpartx'/>
<package name='fdisk'/>
<package name='gawk'/>
<package name='raidtools'/>
<package name='libprelude'/>
<package name='wget'/>
<package name='kernel-image'/>
<package name='prngd'/>
<package name='bash'/>
<package name='openssh'/>
<package name='openssl'/>
<package name='sysstat'/>
<package name='libarchive'/>
<package name='slocate'/>
<package name='mt-st'/>
<package name='lvm2'/>
<package name='tcp_wrappers'/>
<package name='vim'/>
<package name='xz'/>
<package name='kernel-header'/>
<package name='acct'/>
<package name='rpm'/>
<package name='readline'/>
<package name='dmraid'/>
<package name='pcre'/>
<package name='zip'/>
<package name='perl'/>
<package name='time'/>
<package name='groff'/>
<package name='cracklib'/>
<package name='killproc'/>
<package name='traceroute'/>
<package name='ncurses'/>
<package name='memtest86+'/>
<package name='linx_init'/>
<package name='libusb'/>
<package name='hdparm'/>
<package name='sysfsutils'/>
<package name='beecrypt'/>
<package name='linux-pam'/>
<package name='gmp'/>
<package name='grep'/>
<package name='attr'/>
<package name='zlib'/>
<package name='tree'/>
<package name='cdrtools'/>
<package name='perl-gettext'/>
<package name='diffutils'/>
<package name='p7zip'/>
<package name='procps'/>
<package name='xfsprogs'/>
<package name='tar'/>
<package name='libxml2'/>
<package name='expat'/>
<package name='hotplug'/>
<package name='logrotate'/>
<package name='at'/>
<package name='file'/>
<package name='timezone'/>
<package name='ispell'/>
<package name='texinfo'/>
<package name='pkgutils'/>
<package name='acl'/>
<package name='gcc'/>
<package name='mdadm'/>
<package name='gettext'/>
<package name='coreutils'/>
<package name='vixie-cron'/>
<package name='which'/>
<package name='libcap'/>
<package name='libaio'/>
<package name='star'/>
<package name='jfsutils'/>
<package name='tcsh'/>
<package name='pciutils'/>
<package name='quota'/>
<package name='gzip'/>
<package name='dos2unix'/>
<package name='man'/>
<package name='audit'/>
<package name='eject'/>
<package name='lsof'/>
<package name='usbutils'/>
<package name='e2fsprogs'/>
<package name='module-init-tools'/>
<package name='filesystem'/>
<package name='iproute2'/>
<package name='mpfr'/>
<package name='glibc'/>
<package name='bzip2'/>
<package name='libmac'/>
<package name='mectools'/>
<package name='libmec'/>
<package name='mactools'/>
<package name='libcgroup'/>
<package name='cg-manager'/>
</mandatory>
</group>
<group name='development' install='yes'>
<optional selection='all'>
<package name='git-manpages' install='no'/>
<package name='Archive-Zip' install='no'/>
<package name='ant' install='no'/>
<package name='gdb' install='no'/>
<package name='python-genshi' install='no'/>
<package name='dejagnu' install='no'/>
<package name='byacc' install='no'/>
<package name='cmake' install='no'/>
<package name='libxml++' install='no'/>
<package name='IO-Compress-Base' install='no'/>
<package name='IO-Compress-Zlib' install='no'/>
<package name='make' install='no'/>
<package name='autoconf' install='no'/>
<package name='glibmm' install='no'/>
<package name='tls' install='no'/>
<package name='yasm' install='no'/>
<package name='automake' install='no'/>
<package name='subversion' install='no'/>
<package name='m4' install='no'/>
<package name='libstdc++-compat' install='no'/>
<package name='ccache' install='no'/>
<package name='sqlite3' install='no'/>
<package name='ddd' install='no'/>
<package name='flex' install='no'/>
<package name='python-setuptools' install='no'/>
<package name='clearsilver' install='no'/>
<package name='Compress-Raw-Zlib' install='no'/>
<package name='PyXML' install='no'/>
<package name='autogen' install='no'/>
<package name='gperf' install='no'/>
<package name='libidl' install='no'/>
<package name='swig' install='no'/>
<package name='intltool' install='no'/>
<package name='libsigc++' install='no'/>
<package name='git' install='no'/>
<package name='ruby' install='no'/>
<package name='guile' install='no'/>
<package name='bin86' install='no'/>
<package name='subversion-python' install='no'/>
<package name='Compress-Zlib' install='no'/>
<package name='trac' install='no'/>
<package name='jdk' install='no'/>
<package name='strace' install='no'/>
<package name='cvs' install='no'/>
<package name='pstack' install='no'/>
<package name='XML-Parser' install='no'/>
<package name='bison' install='no'/>
<package name='gnupg' install='no'/>
<package name='libtool' install='no'/>
<package name='cscope' install='no'/>
<package name='binutils' install='no'/>
<package name='nasm' install='no'/>
</optional>
</group>
<group name='graphic' install='yes'>
<optional selection='all'>
<package name='x11-libX11' install='no'/>
<package name='x11-libXxf86misc' install='no'/>
<package name='x11-libXft' install='no'/>
<package name='x11-libXrandr' install='no'/>
<package name='glitz' install='no'/>
<package name='x11-libXfixes' install='no'/>
<package name='gd' install='no'/>
<package name='x11-libFS' install='no'/>
<package name='x11-xtrans' install='no'/>
<package name='x11-xcursor-themes' install='no'/>
<package name='x11-twm' install='no'/>
<package name='fontconfig' install='no'/>
<package name='gdk-pixbuf' install='no'/>
<package name='tk' install='no'/>
<package name='x11-fonts-chinese' install='no'/>
<package name='pixman' install='no'/>
<package name='freetype' install='no'/>
<package name='x11-libXdmcp' install='no'/>
<package name='x11-libpciaccess' install='no'/>
<package name='xfonts-encodings' install='no'/>
<package name='kdeedu' install='no'/>
<package name='gtk1' install='no'/>
<package name='gtk2' install='no'/>
<package name='kdegames' install='no'/>
<package name='libdrm' install='no'/>
<package name='dbus-qt3' install='no'/>
<package name='gnutls' install='no'/>
<package name='pango' install='no'/>
<package name='x11-libXmu' install='no'/>
<package name='smplayer' install='no'/>
<package name='fonts-arphic-uming' install='no'/>
<package name='dbus' install='no'/>
<package name='wqy-microhei-lite' install='no'/>
<package name='rxvt' install='no'/>
<package name='cairo' install='no'/>
<package name='scim-qtimm' install='no'/>
<package name='ttf-dejavu' install='no'/>
<package name='rdesktop' install='no'/>
<package name='x11-libXxf86dga' install='no'/>
<package name='x11-libXtst' install='no'/>
<package name='x11-libWindowsWM' install='no'/>
<package name='pycairo' install='no'/>
<package name='x11-libXres' install='no'/>
<package name='x11-proto' install='no'/>
<package name='poppler' install='no'/>
<package name='x11-driver' install='no'/>
<package name='x11-font-util' install='no'/>
<package name='scim-tables' install='no'/>
<package name='kdebindings' install='no'/>
<package name='kdewebdev' install='no'/>
<package name='linx-guide' install='no'/>
<package name='kdepim' install='no'/>
<package name='qt3' install='no'/>
<package name='gpm' install='no'/>
<package name='xdg-utils' install='no'/>
<package name='glib1' install='no'/>
<package name='pygtk' install='no'/>
<package name='xcb-proto' install='no'/>
<package name='x11-libXinerama' install='no'/>
<package name='x11-libXext' install='no'/>
<package name='pygobject' install='no'/>
<package name='windowmaker' install='no'/>
<package name='x11-doc' install='no'/>
<package name='x11-libXpm' install='no'/>
<package name='x11-libXp' install='no'/>
<package name='x11-libXt' install='no'/>
<package name='xpdf' install='no'/>
<package name='x11-libXv' install='no'/>
<package name='atk' install='no'/>
<package name='xosview' install='no'/>
<package name='cairomm' install='no'/>
<package name='kdegraphics' install='no'/>
<package name='x11-libxkbfile' install='no'/>
<package name='x11-libXi' install='no'/>
<package name='glib2' install='no'/>
<package name='mplayer' install='no'/>
<package name='kdesdk' install='no'/>
<package name='x11-app' install='no'/>
<package name='x11-xinit' install='no'/>
<package name='x11-libXfont' install='no'/>
<package name='x11-libXdamage' install='no'/>
<package name='x11-libXScrnSaver' install='no'/>
<package name='xkeyboard-config' install='no'/>
<package name='lesstif' install='no'/>
<package name='libxcb' install='no'/>
<package name='gtkmm' install='no'/>
<package name='sox' install='no'/>
<package name='tightvnc' install='no'/>
<package name='x11-util' install='no'/>
<package name='x11-libXcursor' install='no'/>
<package name='amsn' install='no'/>
<package name='arts' install='no'/>
<package name='emacs' install='no'/>
<package name='kdenetwork' install='no'/>
<package name='Mesa' install='no'/>
<package name='xchat' install='no'/>
<package name='x11-libXcomposite' install='no'/>
<package name='linx-serialnumber' install='no'/>
<package name='kdeaddons' install='no'/>
<package name='x11-libXau' install='no'/>
<package name='x11-libXaw' install='no'/>
<package name='utempter' install='no'/>
<package name='x11-xorg-server' install='no'/>
<package name='x11-libfontenc' install='no'/>
<package name='kdeaccessibility' install='no'/>
<package name='x11-libXfontcache' install='no'/>
<package name='kdelibs' install='no'/>
<package name='ttf-freefont' install='no'/>
<package name='hicolor-icon-theme' install='no'/>
<package name='fonts-arphic-ukai' install='no'/>
<package name='x11-xbitmaps' install='no'/>
<package name='qemu-kvm' install='no'/>
<package name='imlib' install='no'/>
<package name='fcitx' install='no'/>
<package name='x11-libICE' install='no'/>
<package name='curl' install='no'/>
<package name='libpthread-stubs' install='no'/>
<package name='kde-i18n-zh_CN' install='no'/>
<package name='wmctrl' install='no'/>
<package name='kdevelop' install='no'/>
<package name='sip' install='no'/>
<package name='kdebase' install='no'/>
<package name='x11-libSM' install='no'/>
<package name='kdetoys' install='no'/>
<package name='kdemultimedia' install='no'/>
<package name='x11-libXvMC' install='no'/>
<package name='gparted' install='no'/>
<package name='x11-libXrender' install='no'/>
<package name='ttf-arphic-uming' install='no'/>
<package name='scim' install='no'/>
<package name='dbus-glib-1' install='no'/>
<package name='xterm' install='no'/>
<package name='pylinxsn' install='no'/>
<package name='kdeartwork' install='no'/>
<package name='wqy-bitmapfont-gb18030' install='no'/>
<package name='kdeadmin' install='no'/>
<package name='kdeutils' install='no'/>
<package name='xfonts-wqy' install='no'/>
<package name='PyQt-x11-gpl' install='no'/>
<package name='slang' install='no'/>
<package name='x11-libdmx' install='no'/>
<package name='font-x11' install='no'/>
<package name='gamin' install='no'/>
<package name='fribidi' install='no'/>
<package name='scim-pinyin' install='no'/>
<package name='x11-libXxf86vm' install='no'/>
<package name='SDL' install='no'/>
</optional>
</group>
<group name='office' install='yes'>
<optional selection='all'>
<package name='firefox' install='no'/>
<package name='libedit' install='no'/>
<package name='pandoc' install='no'/>
<package name='thunderbird' install='no'/>
<package name='openoffice' install='no'/>
<package name='ghc' install='no'/>
<package name='flashplayer' install='no'/>
</optional>
</group>
<group name='server' install='yes'>
<optional selection='all'>
<package name='netkit-telnet' install='no'/>
<package name='mfs' install='no'/>
<package name='libgpg-error' install='no'/>
<package name='rhel_compatible' install='no'/>
<package name='samba' install='no'/>
<package name='mod_php' install='no'/>
<package name='jdk1.7' install='no'/>
<package name='ipwatchd' install='no'/>
<package name='foomatic-filters' install='no'/>
<package name='mod_perl' install='no'/>
<package name='arp-scan' install='no'/>
<package name='nmap' install='no'/>
<package name='mcelog' install='no'/>
<package name='ethtool' install='no'/>
<package name='libidn' install='no'/>
<package name='ghostscript' install='no'/>
<package name='libglade' install='no'/>
<package name='dhcp' install='no'/>
<package name='dhcpcd' install='no'/>
<package name='xlsfonts' install='no'/>
<package name='numactl' install='no'/>
<package name='libjpeg' install='no'/>
<package name='edac-utils' install='no'/>
<package name='minicom' install='no'/>
<package name='netkit-ftp' install='no'/>
<package name='snort' install='no'/>
<package name='xdotool' install='no'/>
<package name='libvorbis' install='no'/>
<package name='htop' install='no'/>
<package name='megacli' install='no'/>
<package name='fetchmail' install='no'/>
<package name='nail' install='no'/>
<package name='setserial' install='no'/>
<package name='libssh' install='no'/>
<package name='rsync' install='no'/>
<package name='alsa-driver' install='no'/>
<package name='ORBit2' install='no'/>
<package name='dvd+rw-tools' install='no'/>
<package name='pynetifaces' install='no'/>
<package name='sshpass' install='no'/>
<package name='libpng' install='no'/>
<package name='bindutils' install='no'/>
<package name='boost' install='no'/>
<package name='apr' install='no'/>
<package name='wireshark' install='no'/>
<package name='imagemagick' install='no'/>
<package name='ntp' install='no'/>
<package name='procmail' install='no'/>
<package name='jq' install='no'/>
<package name='dmidecode' install='no'/>
<package name='rdate' install='no'/>
<package name='apache' install='no'/>
<package name='libgcrypt' install='no'/>
<package name='newt' install='no'/>
<package name='iptux' install='no'/>
<package name='indent' install='no'/>
<package name='libpcap' install='no'/>
<package name='hplip' install='no'/>
<package name='valgrind' install='no'/>
<package name='fuse' install='no'/>
<package name='uml-utilities' install='no'/>
<package name='open-iscsi' install='no'/>
<package name='boost-jam' install='no'/>
<package name='proftpd' install='no'/>
<package name='libtiff' install='no'/>
<package name='netkit-rsh' install='no'/>
<package name='iotop' install='no'/>
<package name='ipython' install='no'/>
<package name='ppp' install='no'/>
<package name='lshw' install='no'/>
<package name='jasper' install='no'/>
<package name='GConf' install='no'/>
<package name='libmng' install='no'/>
<package name='libungif' install='no'/>
<package name='cups' install='no'/>
<package name='gst-plugins-base' install='no'/>
<package name='perf' install='no'/>
<package name='hydra' install='no'/>
<package name='bridge-utils' install='no'/>
<package name='tcpdump' install='no'/>
<package name='squid' install='no'/>
<package name='esound' install='no'/>
<package name='portmap' install='no'/>
<package name='xcb-util' install='no'/>
<package name='nmon' install='no'/>
<package name='gstreamer' install='no'/>
<package name='linux-identd' install='no'/>
<package name='libgtop' install='no'/>
<package name='lynx' install='no'/>
<package name='libselinux' install='no'/>
<package name='lcms' install='no'/>
<package name='krb5' install='no'/>
<package name='alsa-utils' install='no'/>
<package name='libusb1.0.19' install='no'/>
<package name='sudo' install='no'/>
<package name='secure-delete' install='no'/>
<package name='libart_lgpl' install='no'/>
<package name='lsscsi' install='no'/>
<package name='net-snmp' install='no'/>
<package name='alsa-lib' install='no'/>
<package name='pine' install='no'/>
<package name='nas' install='no'/>
<package name='alsa-oss' install='no'/>
<package name='libnet' install='no'/>
<package name='libsepol' install='no'/>
<package name='unixodbc' install='no'/>
<package name='ntfs-3g_ntfsprogs' install='no'/>
<package name='openldap' install='no'/>
<package name='libogg' install='no'/>
<package name='nfs-utils' install='no'/>
<package name='ipmitool' install='no'/>
<package name='postfix' install='no'/>
<package name='bind' install='no'/>
<package name='sg3_utils' install='no'/>
<package name='cyrus-sasl2' install='no'/>
<package name='audiofile' install='no'/>
<package name='webfs' install='no'/>
<package name='linx-app' install='no'/>
<package name='dstat' install='no'/>
</optional>
</group>
</groups>
<services>
<service start='yes' script='fuse' number='S315' name='fuse' package='fuse'/>
<service start='yes' script='inetd' number='S310' name='rlogin' package='netkit-rsh'/>
<service start='yes' script='inetd' number='S310' name='telnet' package='netkit-telnetd'/>
<service start='yes' script='sshd' number='S205' name='ssh' package='openssh'/>
<service start='yes' script='proftpd' number='S280' name='ftp' package='proftpd'/>
</services>
<finishstate flag='nothing'/>
</install>