Merge 7911229 into 8ef14c9

package/yast2-installation.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jan 14 11:25:19 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
+
+- drop starting of hal as it is also obsolete and no longer exist
+  (jsc#SLE-10976)
+- drop deprecated network technologies (jsc#SLE-7753)
+- replace rc* and init.d usage by systemd or start_service
+  depending if it runs in first stage or second (jsc#SLE-10976)
+- 4.2.26
+
 -------------------------------------------------------------------
 Thu Nov 21 14:33:50 UTC 2019 - schubi@suse.de
 

package/yast2-installation.spec

@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.2.25
+Version:        4.2.26
 Release:        0
 Group:          System/YaST
 License:        GPL-2.0-only

startup/Second-Stage/S02-logging

@@ -3,14 +3,7 @@ log "Starting S02-logging..."
 log "======================="
 
 #=============================================
-# 3) start syslog daemon
-#---------------------------------------------
-if [ -x /etc/init.d/syslog ];then
-	/etc/init.d/syslog start
-fi
-
-#=============================================
-# 3.1) set debug and logging options
+# 3) set debug and logging options
 #---------------------------------------------
 
 # fate#302166: store y2debug messages and log them on crash

startup/Second-Stage/S06-services

@@ -1,54 +1,3 @@
 #!/bin/sh
 log "Starting S06-services..."
 log "========================"
-
-#=============================================
-# 9) start services
-#---------------------------------------------
-if [ -x /sbin/rcpcmcia ] ; then
-if [ -r /etc/sysconfig/pcmcia ];then
-	# /.../
-	# To start the pcmcia subsystem we need to set the following
-	# variables within /etc/sysconfig/pcmcia file
-	# ---
-	TMP=`/bin/mktemp /tmp/sysconfig.pcmcia.XXXXXX`
-	ISI=/etc/install.inf
-	RCC=/etc/sysconfig/pcmcia
-	cp $RCC $TMP
-	CORE=`sed -n "/^options/s/^.*pcmcia_core //p" $ISI`
-	PCIC=`sed -n "/^options/s/^.*\(i82365\|tcic\) //p" $ISI`
-	sed -e "/^PCMCIA_CORE_OPTS/s/=.*$/=\"$CORE\"/" \
-		-e "/^PCMCIA_PCIC_OPTS/s/=.*$/=\"$PCIC\"/" $TMP > $RCC
-	rm $TMP
-	# /.../
-	# It does not matter whether pcmcia is already active or not because:
-	# 1) loading an already loaded module does not harm
-	# 2) the cardmgr is already dead. cardmgr was the same binary as linuxrc.
-	# 3) there is no configuration info in network.opts, so eth0 will stay
-	#    completely untouched and its state is "up"
-	# ---
-	# We are safe to start the subsystem now
-	# ---
-	if grep -qs '^PCMCIA:' /etc/install.inf ; then
-		log "\tStarting PCMCIA service..."
-		log "\tUsing following PCMCIA configuration:"
-		IFS="
-		"
-		while read line;do
-			log "\t$line"
-		done < $RCC
-		rcpcmcia start
-	fi
-fi
-fi
-
-#=============================================
-# 9.1) start hald
-#---------------------------------------------
-if [ -x /usr/sbin/rchal ] ; then
-	test -f /usr/sbin/rcdbus  && /usr/sbin/rcdbus  start
-	test -f /usr/sbin/rcacpid && /usr/sbin/rcacpid start
-	test -f /usr/sbin/rchal   && /usr/sbin/rchal   start
-fi
-
-sleep 1

startup/Second-Stage/S07-medium

@@ -24,8 +24,8 @@ fi
 #---------------------------------------------
 if [ ! -z "$(ls /etc/sysconfig/network/ifcfg-* |grep  -v 'ifcfg-lo')" ]; then
 	log "\tnetwork configuration found -> activate network"
-	rcnetwork start && Y2_NETWORK_ACTIVE=1
-	[ -f /var/lib/YaST2/network_install_rpcbind ] && rcrpcbind start
+	/bin/systemctl start network && Y2_NETWORK_ACTIVE=1
+	[ -f /var/lib/YaST2/network_install_rpcbind ] && /bin/systemctl start rpcbind
 fi
 
 #=============================================
@@ -38,7 +38,7 @@ fi
 
 if got_install_param '^UseSSH:.*1' ; then
 	log "\tGot kernel parameter UseSSH -> export UseSSH variable"
-	rcsshd start    && Y2_SSH_ACTIVE=1
+	/bin/systemctl start sshd && Y2_SSH_ACTIVE=1
 	export USE_SSH=1
 fi
 log "\tSummary for commandline checks:"

startup/Second-Stage/S09-cleanup

@@ -20,30 +20,22 @@ fi
 # 13.3) stop network and sshd
 if [ "$Y2_NETWORK_ACTIVE" -ne 0 ] ; then
 	log "\tShutdown SSH daemon and network interfaces..."
-	test -z "$Y2_SSH_ACTIVE" && rcsshd stop
+	test -z "$Y2_SSH_ACTIVE" && /bin/systemctl stop sshd
 
 #
 #	network mustn't be stopped when using systemd - systemd ignores
 #	network service startup in such case.
 #	restart is used to force reconfiguration of network - first stage
 #	config is used up to now.
 #
-	rcnetwork restart
-fi
-# 13.4) stop pcmcia service
-if [ -x /sbin/rcpcmcia ] ; then
-if rcpcmcia status ; then
-	log "\tShutdown PCMCIA services..."
-	/sbin/cardctl eject
-	/etc/init.d/pcmcia stop
-fi
+	/bin/systemctl restart network
 fi
 
 # 13.5) restart other services if necessary (bnc#395402)
 if [ -f /var/lib/YaST2/restart_services ] ; then
     cat /var/lib/YaST2/restart_services | while read service; do
 	log "\tRestart $service service..."
-	test -f /etc/init.d/$service  && /etc/init.d/$service restart
+	/bin/systemctl restart $service
     done
     rm -f /var/lib/YaST2/restart_services
 fi

startup/YaST2.call

@@ -116,8 +116,8 @@ function prepare_for_ncurses () {
 			-e "s#brlport=.*#brlport=$Brailledevice#" /etc/sbl.conf \
 		>/tmp/suse-blinux.conf
 		mv -f /tmp/suse-blinux.conf /etc/sbl.conf
-		/etc/init.d/brld start
-		/etc/init.d/sbl start
+		/bin/start_service brld
+		/bin/start_service sbl
 	fi
 	fi
 	#=============================================