Commit d88b2c076f5576cc19a3c2759c019c62c003685f - sysvinit

debian: sysvinit postinst creates compat initctl link unconditionally Roger Leigh 11 years ago

2 changed file(s) with 13 addition(s) and 17 deletion(s). Raw diff Collapse all Expand all

-0

debian/changelog less more

1	1
2	2	[ Roger Leigh ]:
3	3	* initscripts postinst calls urandom, not urandom.sh (Closes: #698966).
	4	* sysvinit postinst unconditionally creates a compatibility initctl
	5	link to ensure the migration to /run won't fail (Closes: #663009).
4	6
5	7	-- Roger Leigh <rleigh@debian.org> Sat, 26 Jan 2013 12:09:29 +0000
6	8

+11

-17

debian/postinst less more

22	22
23	23	# Create /run/initctl if not present, and also create compatibility
24	24	# symlinks
25		if [ "$INITCTL" ] && [ ! -p "$INITCTL" ]
	25	if [ ! -p "$INITCTL" ]
26	26	then
27	27	# Create new control channel
28	28	echo "sysvinit: creating $INITCTL"
29	29	rm -f $INITCTL
30	30	mkfifo -m 600 $INITCTL
31	31
32		# Replace old control channel (if present) with symlink
33		if [ -e "$OLDINITCTL" ]; then
34		ln -s "$INITCTL" "$OLDINITCTL.new"
35		mv "$OLDINITCTL.new" "$OLDINITCTL"
36		fi
	32	# Replace old control channel with symlink
	33	ln -s "$INITCTL" "$OLDINITCTL.new"
	34	mv "$OLDINITCTL.new" "$OLDINITCTL"
37	35
38	36	# Reopen control channel (uses new channel).
39		if ! ischroot && [ -n "$PID" ]
	37	if ! ischroot
40	38	then
41	39	kill -s USR1 "$PID"
42	40	fi

48	46	cp -p /usr/share/sysvinit/inittab /etc/inittab
49	47	fi
50	48
51		# Tell init to re-exec itself. We loop on failure because to reduce
52		# the chance of a race before the new control channel is opened.
53		if ! ischroot && [ -n "$PID" ]
	49	# Tell init to re-exec itself. We loop on failure to reduce
	50	# the chance of a race before the new control channel is
	51	# opened.
	52	if ! ischroot
54	53	then
55	54	echo -n "sysvinit: restarting..."
56	55	for delay in 0 1 2 3 4 5 6 fail;

70	69	fi
71	70	done
72	71	else
73		if [ -n "$PID" ]
74		then
75		echo "Not restarting sysvinit: chroot detected"
76		else
77		echo "Not restarting sysvinit: init not running"
78		fi
	72	echo "Not restarting sysvinit: chroot detected"
79	73	fi
80	74
81	75	# Remove old pipe if present. No longer in use after re-exec.
82		if [ "$OLDINITCTL" ] && [ -p "$OLDINITCTL" ]
	76	if [ -p "$OLDINITCTL" ]
83	77	then
84	78	rm -f "$OLDINITCTL"
85	79	fi