blob: 6242e23b9c668dd1b11561f47faf2af3d814cd4c [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 44226393812399c61de9ca9281efa002ad4f4c01 Mon Sep 17 00:00:00 2001
Brad Bishopd7bf8c12018-02-25 22:55:05 -05002From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 1 Jun 2017 15:15:15 +0800
4Subject: [PATCH 3/4] comment out sections shutdown and environment in
5 generated kickstart file
6
7Both of them is disabled by default.
8
Andrew Geissler6aa7eec2023-03-03 12:41:14 -06009Upstream-Status: Inappropriate [oe specific]
Brad Bishopd7bf8c12018-02-25 22:55:05 -050010
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12
13fixup! add comments of shutdown for user
14---
15 pykickstart/commands/reboot.py | 3 +++
16 pykickstart/parser.py | 2 +-
17 2 files changed, 4 insertions(+), 1 deletion(-)
18
19diff --git a/pykickstart/commands/reboot.py b/pykickstart/commands/reboot.py
Brad Bishop8410d612019-11-25 09:40:59 -050020index 75a6d916..edfe83ff 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -050021--- a/pykickstart/commands/reboot.py
22+++ b/pykickstart/commands/reboot.py
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080023@@ -43,6 +43,9 @@ class FC3_Reboot(KickstartCommand):
Brad Bishopd7bf8c12018-02-25 22:55:05 -050024 elif self.action == KS_SHUTDOWN:
25 retval += "# Shutdown after installation\nshutdown"
26 retval += self._getArgsAsStr() + "\n"
27+ else:
28+ retval += "# Shutdown after installation\n#shutdown"
29+ retval += self._getArgsAsStr() + "\n"
30
31 return retval
32
33diff --git a/pykickstart/parser.py b/pykickstart/parser.py
Brad Bishop8410d612019-11-25 09:40:59 -050034index bc59131b..b2d09d45 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -050035--- a/pykickstart/parser.py
36+++ b/pykickstart/parser.py
Brad Bishop8410d612019-11-25 09:40:59 -050037@@ -428,7 +428,7 @@ class Packages(KickstartObject):
Brad Bishopd7bf8c12018-02-25 22:55:05 -050038
39 if not self.default:
40 if self.environment:
41- pkgs += "@^%s\n" % self.environment
42+ pkgs += "#@^%s\n" % self.environment
43
Brad Bishop8410d612019-11-25 09:40:59 -050044 grps = self.groupList
45 grps.sort()
Brad Bishopd7bf8c12018-02-25 22:55:05 -050046--
472.7.4
48