Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From be6012a5dd49ae5e8ac035654ab1c6f37f0dc8f4 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Thu, 1 Jun 2017 15:15:15 +0800 |
| 4 | Subject: [PATCH 3/4] comment out sections shutdown and environment in |
| 5 | generated kickstart file |
| 6 | |
| 7 | Both of them is disabled by default. |
| 8 | |
| 9 | Upstream-Status: Inappropriate[oe specific] |
| 10 | |
| 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 12 | |
| 13 | fixup! 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 | |
| 19 | diff --git a/pykickstart/commands/reboot.py b/pykickstart/commands/reboot.py |
| 20 | index 88799ba..2d0cea9 100644 |
| 21 | --- a/pykickstart/commands/reboot.py |
| 22 | +++ b/pykickstart/commands/reboot.py |
| 23 | @@ -41,6 +41,9 @@ class FC3_Reboot(KickstartCommand): |
| 24 | 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 | |
| 33 | diff --git a/pykickstart/parser.py b/pykickstart/parser.py |
| 34 | index 264ba05..b3f33d7 100644 |
| 35 | --- a/pykickstart/parser.py |
| 36 | +++ b/pykickstart/parser.py |
| 37 | @@ -383,7 +383,7 @@ class Packages(KickstartObject): |
| 38 | |
| 39 | if not self.default: |
| 40 | if self.environment: |
| 41 | - pkgs += "@^%s\n" % self.environment |
| 42 | + pkgs += "#@^%s\n" % self.environment |
| 43 | |
| 44 | grps = self.groupList |
| 45 | grps.sort() |
| 46 | -- |
| 47 | 2.7.4 |
| 48 | |