blob: 81e351b11f729810306e88adc20f33b88de2e869 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From 44226393812399c61de9ca9281efa002ad4f4c01 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Thu, 1 Jun 2017 15:15:15 +0800
Subject: [PATCH 3/4] comment out sections shutdown and environment in
generated kickstart file
Both of them is disabled by default.
Upstream-Status: Inappropriate[oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
fixup! add comments of shutdown for user
---
pykickstart/commands/reboot.py | 3 +++
pykickstart/parser.py | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/pykickstart/commands/reboot.py b/pykickstart/commands/reboot.py
index 2c1b1c0..b3ec717 100644
--- a/pykickstart/commands/reboot.py
+++ b/pykickstart/commands/reboot.py
@@ -43,6 +43,9 @@ class FC3_Reboot(KickstartCommand):
elif self.action == KS_SHUTDOWN:
retval += "# Shutdown after installation\nshutdown"
retval += self._getArgsAsStr() + "\n"
+ else:
+ retval += "# Shutdown after installation\n#shutdown"
+ retval += self._getArgsAsStr() + "\n"
return retval
diff --git a/pykickstart/parser.py b/pykickstart/parser.py
index e68174d..efd78a6 100644
--- a/pykickstart/parser.py
+++ b/pykickstart/parser.py
@@ -385,7 +385,7 @@ class Packages(KickstartObject):
if not self.default:
if self.environment:
- pkgs += "@^%s\n" % self.environment
+ pkgs += "#@^%s\n" % self.environment
grps = self.groupList
grps.sort()
--
2.7.4
|
