diff --git a/xCAT-server/share/xcat/install/scripts/post.xcat b/xCAT-server/share/xcat/install/scripts/post.xcat index 601af8ab9..f200f93ff 100755 --- a/xCAT-server/share/xcat/install/scripts/post.xcat +++ b/xCAT-server/share/xcat/install/scripts/post.xcat @@ -286,7 +286,7 @@ EOF msgutil_r "$MASTER_IP" "debug" "/etc/systemd/system/xcatpostinit1.service generated" "/var/log/xcat/xcat.log" "$log_label" fi - ln -s /etc/systemd/system/xcatpostinit1.service /etc/systemd/system/multi-user.target.wants/xcatpostinit1.service + ln -s /etc/systemd/system/xcatpostinit1.service /etc/systemd/system/multi-user.target.wants/xcatpostinit1.service if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then msgutil_r "$MASTER_IP" "debug" "xcatpostinit1.service enabled" "/var/log/xcat/xcat.log" "$log_label" @@ -308,7 +308,7 @@ EOF msgutil_r "$MASTER_IP" "debug" "/etc/init.d/xcatpostinit1 generated" "/var/log/xcat/xcat.log" "$log_label" fi fi - + if [[ $OSVER == ubuntu* ]]; then ln -s /etc/init.d/xcatpostinit1 /etc/rc2.d/S84xcatpostinit1 else @@ -316,7 +316,7 @@ EOF ln -s /etc/init.d/xcatpostinit1 /etc/rc.d/rc4.d/S84xcatpostinit1 ln -s /etc/init.d/xcatpostinit1 /etc/rc.d/rc5.d/S84xcatpostinit1 fi - + if [[ $OSVER == ubuntu* ]]; then update-rc.d xcatpostinit1 defaults else @@ -373,7 +373,7 @@ else fi -#create the dskls post +#create the dskls post cat >/opt/xcat/xcatdsklspost << 'EOF' #INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost# EOF @@ -430,16 +430,16 @@ if [[ $OSVER == ubuntu* ]]; then elif [[ -r /boot/grub/grub.cfg ]] ; then update-grub fi - + #print the kernel messages and service start messages with systemd on the console during system bootup [ -f /etc/default/grub ] && sed -i -e '/GRUB_CMDLINE_LINUX_DEFAULT=/s/quiet//;s/splash//' -e '/#GRUB_TERMINAL=/s/#//' -e 's/#GRUB_GFXMODE=.*/GRUB_GFXMODE=text/' /etc/default/grub && update-grub if echo "$ARCH" | grep -i 'x86_64'; then #grab the install-time console configuration from /proc/cmdline inside os installer CONSOLECFG=$(awk 'BEGIN{RS="[ \n]" ;ORS=" "} $0 ~ /^console=/{print $0}' /proc/cmdline) - #if the console configuration is not applied to the grub configuration,apply it + #if the console configuration is not applied to the grub configuration,apply it cat /boot/grub/grub.cfg |grep "$CONSOLECFG" >/dev/null 2>&1 || ([ -f /etc/default/grub ] && sed -i -e "/GRUB_CMDLINE_LINUX_DEFAULT=/s/=\"/=\" $CONSOLECFG /" /etc/default/grub && update-grub) - fi + fi if echo "$ARCH" | grep -i 'ppc64'; then if [ -z "$CONSOLEPORT" ] ; then export CONSOLEPORT=0 @@ -454,8 +454,8 @@ if [[ $OSVER == ubuntu* ]]; then cat >/etc/init/$CONSOLE\.conf << 'EOF' start on stopped rc RUNLEVEL=[2345] and ( - not-container or - container CONTAINER=lxc or + not-container or + container CONTAINER=lxc or container CONTAINER=lxc-libvirt) stop on runlevel [!2345] @@ -493,11 +493,11 @@ updateflag.awk $MASTER 3002 cd / -# fix the issue#929@github, the "service network restart" in +# fix the issue#929@github, the "service network restart" in # makes the 'network' service in start status, then it causes the # services YaST2-Second-Stage.service and xcatpostinit1 services to be run in parallel. # But the YaST2-Second-Stage.service calls the Yast2 which conflics with the zypper -# which is called in xcatpostinit1->otherpkgs. +# which is called in xcatpostinit1->otherpkgs. # The correct services start order is 'YaST2-Second-Stage.service'->'network'->'xcatpostinit1' in serial. # To skip the conflict, the network service should be stoped in the yast first stage. Then base on the service # dependency, the service start order will be 'YaST2-Second-Stage.service'->'network'->'xcatpostinit1' in serial.