From f9f506928f122e4ffa8b2f8757922399925a90fb Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 10 2019 10:38:23 +0000
Subject: import initscripts-10.00.1-1.el8_0.1


---

diff --git a/SOURCES/patch000-fix_escape_sequence_being_output_under_systemd_service_units.patch b/SOURCES/patch000-fix_escape_sequence_being_output_under_systemd_service_units.patch
new file mode 100644
index 0000000..a548bc6
--- /dev/null
+++ b/SOURCES/patch000-fix_escape_sequence_being_output_under_systemd_service_units.patch
@@ -0,0 +1,16 @@
+diff --git a/etc/rc.d/init.d/functions b/etc/rc.d/init.d/functions
+index 97f09d13..9b0add1c 100644
+--- a/etc/rc.d/init.d/functions
++++ b/etc/rc.d/init.d/functions
+@@ -84,8 +84,9 @@ if [ -z "${BOOTUP:-}" ]; then
+         LOGLEVEL=1
+     fi
+ 
+-    # NOTE: /dev/ttyS* is serial console.
+-    if tty | grep --quiet -e '/dev/ttyS'; then
++    # NOTE: /dev/ttyS* is serial console. "not a tty" is such as
++    # /dev/null associated when executed under systemd service units.
++    if LANG=C tty | grep --quiet -e '\(/dev/ttyS\|not a tty\)'; then
+         BOOTUP=serial
+         MOVE_TO_COL=
+         SETCOLOR_SUCCESS=
diff --git a/SOURCES/patch001-fix_missing_python3_during_build_phase.patch b/SOURCES/patch001-fix_missing_python3_during_build_phase.patch
new file mode 100644
index 0000000..8e97a13
--- /dev/null
+++ b/SOURCES/patch001-fix_missing_python3_during_build_phase.patch
@@ -0,0 +1,30 @@
+diff --git a/Makefile b/Makefile
+index d91b9bcf..7dbadae4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -42,7 +42,7 @@ make-binaries:
+ 	$(MAKE) -C src
+ 
+ make-translations:
+-	$(MAKE) -C po
++	$(MAKE) -C po PYTHON=$(PYTHON)
+ 
+ 
+ # NOTE: We are no longer installing into /usr/sbin directory, because this is
+diff --git a/po/Makefile b/po/Makefile
+index abb0258d..02a58b08 100644
+--- a/po/Makefile
++++ b/po/Makefile
+@@ -38,7 +38,11 @@ POTFILES    = $(shell ls ../network-scripts/* | grep -v ifcfg-) \
+ all: $(NLSPACKAGE).pot $(FMTCATALOGS)
+ 
+ $(NLSPACKAGE).pot: $(POTFILES)
+-	./xgettext_sh.py $(POTFILES) > $(NLSPACKAGE).po
++	if [ -z "$(PYTHON)" ]; then \
++		./xgettext_sh.py $(POTFILES) > $(NLSPACKAGE).po; \
++	else \
++		$(PYTHON) xgettext_sh.py $(POTFILES) > $(NLSPACKAGE).po; \
++	fi
+ 	if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \
+ 	    rm -f $(NLSPACKAGE).po; \
+ 	else \
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 4835491..46871af 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -19,7 +19,7 @@ Requires:         gawk                       \
 Name:             initscripts
 Summary:          Basic support for legacy System V init scripts
 Version:          10.00.1
-Release:          1%{?dist}
+Release:          1%{?dist}.1
 
 License:          GPLv2
 
@@ -63,8 +63,9 @@ Obsoletes:        %{name}            < 9.82-2
 
 # Upstream patches -- official upstream patches released by upstream since the
 # ----------------    last rebase that are necessary for any reason:
-#Patch000: example000.patch
-
+#Patch000:  example000.patch
+Patch000:   patch000-fix_escape_sequence_being_output_under_systemd_service_units.patch
+Patch001:   patch001-fix_missing_python3_during_build_phase.patch
 
 # Downstream patches -- these should be always included when doing rebase:
 # ------------------
@@ -182,7 +183,7 @@ support. Additional configuration is required after installation.
 # ---------------
 
 %build
-%make_build
+%make_build PYTHON=%{__python3}
 
 # ---------------
 
@@ -346,6 +347,9 @@ fi
 # =============================================================================
 
 %changelog
+* Mon Aug 12 2019 Jan Macku <jamacku@redhat.com> - 10.00.1-1.1
+- rc.d/functions: fix escape sequence being output under systemd service units
+
 * Fri Aug 03 2018 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 10.00.1-1
 - consoletype/genhostid/usleep: allow disabling of deprecation warnings
 - network/ifup/ifdown: allow disabling of deprecation warnings