add addkcmdline support to ubuntu

Signed-off-by: Arif Ali <mail@arif-ali.co.uk>

xCAT-server/share/xcat/install/scripts/post.ubuntu

@@ -191,7 +191,13 @@ if [[ -r /boot/grub/menu.lst ]]; then
 sed -i 's/^serial/#serial/' /boot/grub/menu.lst
 sed -i 's/^terminal/#terminal/' /boot/grub/menu.lst
 elif [[ -r /boot/grub/grub.cfg ]] ; then
-update-grub
+UPDATEGRUB=1
+fi
+export PROVMETHOD=#TABLE:nodetype:THISNODE:provmethod#
+export KERNELARGS=#TABLE:linuximage:$PROVMETHOD:addkcmdline#
+if [[ -n $KERNELARGS ]] ; then
+  sed -i "s/\(GRUB_CMDLINE_LINUX=\).*/\1\"$KERNELARGS\"/" /etc/default/grub
+  UPDATEGRUB=1
 fi
 if echo "$ARCH" | grep -i 'ppc64'; then
     CONSOLE="hvc$CONSOLEPORT"
@@ -200,7 +206,7 @@ if echo "$ARCH" | grep -i 'ppc64'; then
     else
         echo "GRUB_CMDLINE_LINUX_DEFAULT=\"console=$CONSOLE\"" > /etc/default/grub
     fi
-    update-grub
+    UPDATEGRUB=1
 
 cat >/etc/init/$CONSOLE\.conf << 'EOF'
 start on stopped rc RUNLEVEL=[2345] and (not-container or container container CONTAINER=lxc or container CONTAINER=lxc-libvirt)
@@ -220,6 +226,9 @@ script
 end script
 EOF
 fi
+if [[ $UPDATEGRUB -eq 1 ]]; then
+  update-grub
+fi
 sed -i 's/\(deb.*security.*\)/#\1/' /etc/apt/sources.list
 #iso does not contains source deb packages
 sed -i 's/^\(\s*deb-src.*install.*\)$/#\1/g' /etc/apt/sources.list

xCAT-server/usr/lib/systemd/system/xcatd.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=xCAT Management Service
-After=network.target syslog.target sshd.service
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/xcat
-ExecStart=/opt/xcat/sbin/xcatd -p /var/run/xcatd.pid
-PIDFile=/var/run/xcatd.pid
-
-[Install]
-WantedBy=multi-user.target

xCAT-server/xCAT-server.spec

@@ -55,16 +55,6 @@ Requires: xCAT-client  >= %{epoch}:%(cat Version|cut -d. -f 1,2)
 
 Provides: xCAT-server = %{epoch}:%{version}
 
-%if 0%{!?initscripttype:1}
-# initscripttype not explicitly defined in some macro file or on commandline
-# use presence of systemd_post macro to determine the initscripttype
-%if %{?systemd_post:1}%{!?systemd_post:0}
-%global initscripttype systemd
-%else
-%global initscripttype sysv
-%endif
-%endif
-
 %description
 xCAT-server provides the core server and configuration management components of xCAT.  This package should be installed on your management server
 
@@ -138,6 +128,8 @@ chmod -h 755 $RPM_BUILD_ROOT/%{prefix}/sbin/*
 cp -h bin/* $RPM_BUILD_ROOT/%{prefix}/bin
 chmod -h 755 $RPM_BUILD_ROOT/%{prefix}/bin/*
 %endif
+#cp rc.d/* $RPM_BUILD_ROOT/%{prefix}/rc.d
+#chmod 755 $RPM_BUILD_ROOT/%{prefix}/rc.d/*
 
 cp share/xcat/ca/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/ca
 chmod 644 $RPM_BUILD_ROOT/%{prefix}/share/xcat/ca/*
@@ -225,6 +217,7 @@ rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/aixinstall.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/slpdiscover.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/remoteimmsetup.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/IMMUtils.pm
+#rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/RShellAPI.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/bmcconfig.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/bpa.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/esx.pm
@@ -320,14 +313,9 @@ cp lib/xcat/shfunctions $RPM_BUILD_ROOT/%{prefix}/lib
 chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/shfunctions
 %if %fsm
 %else
-%if %{initscripttype} == "systemd"
-mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system
-cp usr/lib/systemd/system/xcatd.service $RPM_BUILD_ROOT/usr/lib/systemd/system
-%else
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 cp etc/init.d/xcatd $RPM_BUILD_ROOT/etc/init.d
 %endif
-%endif
 #TODO: the next has to me moved to postscript, to detect /etc/xcat vs /etc/opt/xcat
 mkdir -p $RPM_BUILD_ROOT/etc/xcat
 
@@ -381,11 +369,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/xcat
 %if %fsm
 %else
-%if %{initscripttype} == "systemd"
-/usr/lib/systemd/system/xcatd.service
-%else
 /etc/init.d/xcatd
-%endif
 #/etc/xcat/conf.orig/xcat-ws.conf.apache24
 #/etc/xcat/conf.orig/xcat-ws.conf.apache22
 /etc/apache2/conf.d/xcat-ws.conf
@@ -393,9 +377,6 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Thu Jun 11 2015 - Arif Ali <aali@ocf.co.uk>
-- Add systemd support
-
 * Fri Nov 20 2007 - Jarrod Johnson <jbjohnso@us.ibm.com>
 - Changes for relocatible rpm.
 
@@ -429,9 +410,6 @@ if [ "$1" = "1" ]; then #Only if installing for the first time..
    /usr/lib/lsb/install_initd /etc/init.d/xcatd
  elif [ -x /sbin/chkconfig ]; then
    /sbin/chkconfig --add xcatd
- elif [ -x /usr/bin/systemctl ]; then
-   /usr/bin/systemctl daemon-reload
-   /usr/bin/systemctl enable xcatd
  else
    echo "Unable to register init scripts on this system"
  fi
@@ -475,27 +453,16 @@ exit 0
 %preun
 %ifos linux
 if [ $1 == 0 ]; then  #This means only on -e
-  if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
-    /etc/init.d/xcatd stop
-  fi
+	if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
+  		/etc/init.d/xcatd stop
+  	fi
   if [ -x /usr/lib/lsb/remove_initd ]; then
-    /usr/lib/lsb/remove_initd /etc/init.d/xcatd
+      /usr/lib/lsb/remove_initd /etc/init.d/xcatd
   elif [ -x /sbin/chkconfig ]; then
     /sbin/chkconfig --del xcatd
-  elif [ -x /usr/bin/systemctl ]; then
-    /usr/bin/systemctl daemon-reload
-    /usr/bin/systemctl disable xcatd
   fi
   rm -f /usr/sbin/xcatd  #remove the symbolic
 
 fi
 %endif
 
-%postun
-%ifos linux
-if [ $1 == 0 ]; then  #This means only on -e
-  if [ -x /usr/bin/systemctl ]; then
-    /usr/bin/systemctl daemon-reload
-  fi
-fi
-