[lorax] Don't remove krb5-libs (#848227)
by Martin Gracik
Anaconda needs it.
---
share/runtime-cleanup.tmpl | 1 -
1 file changed, 1 deletion(-)
diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 15d1e32..06d7425 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -230,7 +230,6 @@ removefrom initscripts /etc/ppp/* /usr/sbin/* /usr/share/locale/*
removefrom iproute --allbut /usr/sbin/{ip,routef,routel,rtpr}
removefrom iscsi-initiator-utils /etc/rc.d/*
removefrom kbd --allbut */bin/{dumpkeys,kbd_mode,loadkeys,setfont,unicode_*,chvt}
-removefrom krb5-libs /etc/* /${libdir}/libgssrpc* /usr/${libdir}/*
removefrom less /etc/*
removefrom libX11-common /usr/share/X11/XErrorDB
removefrom libbonobo /etc/* /usr/bin/* /usr/sbin/* /usr/share/locale/*
--
1.7.9.5
11 years, 9 months
Text mode patches, take 2
by Jesse Keating
A couple of these patches you've already seen, this time they add entries to
POTFILES.in.
Patch 3 corrects the completed property for the timezone spoke.
Patch 4 prevents the summery hub from continuing on until all the spokes are
considered "complete".
Patch 5 updates the prompt so that users know that "c" is for continue.
Patch 6 enables text mode once again, by passing "text" or "cmdline" at the
boot prompt. cmdline is still not hooked into the noprompt thing, and
I don't know what happens if you try to kickstart install in text mode. But
this gets us partly to a real text mode for F18.
-jlk
11 years, 9 months
[PATCH] Use shell code to work around missing basename
by Jesse Keating
Basename got removed from dracut land. This was our only use of it so
use shell built ins to accomplish the same thing. Sadly you cannot
strip both prefix and suffix at the same time, so take a two step
approach.
---
dracut/anaconda-modprobe.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dracut/anaconda-modprobe.sh b/dracut/anaconda-modprobe.sh
index 20f173f..a14d27a 100644
--- a/dracut/anaconda-modprobe.sh
+++ b/dracut/anaconda-modprobe.sh
@@ -7,7 +7,10 @@ MODULE_LIST="cramfs squashfs iscsi_tcp "
SCSI_MODULES=/lib/modules/$KERNEL/kernel/drivers/scsi/device_handler/
for m in $SCSI_MODULES/*.ko; do
- MODULE_LIST+=" `basename $m .ko` "
+ # Shell spew to work around not having basename
+ # Trim the paths off the prefix, then the . suffix
+ a="${m##*/}"
+ MODULE_LIST+=" ${a%*.}"
done
if [ "$ARCH" != "s390" -a "$ARCH" != "s390x" ]; then
--
1.7.11.2
11 years, 9 months
[PATCH 1/5] Add the user-agent to urlgrabber from the old yuminstall.py.
by Chris Lumens
---
pyanaconda/packaging/__init__.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py
index 4d56bfa..4dee79e 100644
--- a/pyanaconda/packaging/__init__.py
+++ b/pyanaconda/packaging/__init__.py
@@ -53,6 +53,10 @@ log = logging.getLogger("packaging")
from pyanaconda.errors import *
#from pyanaconda.progress import progress
+from pyanaconda.product import productName, productVersion
+import urlgrabber
+urlgrabber.grabber.default_grabber.opts.user_agent = "%s (anaconda)/%s" %(productName, productVersion)
+
###
### ERROR HANDLING
###
--
1.7.11.2
11 years, 9 months
Text mode patches
by Jesse Keating
Patch 1 adds a storage spoke. I've tested it in kvm and it mostly works. It
sets completed or not based on existence of errors from the sanity check,
but right now the text summary hub doesn't seem to care about continuation
when there are incomplete spokes. That will be fixed soon.
Second patch is a progress hub to actually do the install. Also tested in kvm,
surely some errors are hidden but it mostly works.
-jlk
11 years, 9 months
[PATCH] Prevent yum messages from showing on tty
by Jesse Keating
This is a hammer. A more subtle fix could be done to tie into yum's
logging infrastructure and do something sensible with it.
---
pyanaconda/packaging/yumpayload.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index f6f940a..7695bad 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -182,6 +182,12 @@ class YumPayload(PackagePayload):
# set this now to the best default we've got ; we'll update it if/when
# we get a base repo set up
self._yum.preconf.releasever = self._getReleaseVersion(None)
+ # Hammer the yum logs to nothing, we log around yum. This is
+ # to prevent stuff from leaking to the screen. Need a less hammer
+ # approach to this so that we could have rich yum logs but clean
+ # screens
+ self._yum.preconf.debuglevel = 0
+ self._yum.preconf.errorlevel = 0
self.txID = None
--
1.7.11.2
11 years, 9 months
[PATCH] Deprecate the 'cmdline' command
by Jesse Keating
For now make it set text mode instead of erroring.
---
pykickstart/commands/displaymode.py | 33 +++++++++++++++++++++++++++++++++
pykickstart/handlers/control.py | 12 ++++++------
2 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/pykickstart/commands/displaymode.py b/pykickstart/commands/displaymode.py
index 6a12d58..fc8fb12 100644
--- a/pykickstart/commands/displaymode.py
+++ b/pykickstart/commands/displaymode.py
@@ -66,3 +66,36 @@ class FC3_DisplayMode(KickstartCommand):
self.displayMode = DISPLAY_MODE_TEXT
return self
+
+class F18_DisplayMode(FC3_DisplayMode):
+ removedKeywords = FC3_DisplayMode.removedKeywords
+ removedAttrs = FC3_DisplayMode.removedAttrs
+
+ def __str__(self):
+ retval = KickstartCommand.__str__(self)
+
+ if self.displayMode is None:
+ return retval
+
+ if self.displayMode in [DISPLAY_MODE_CMDLINE, DISPLAY_MODE_TEXT]:
+ retval += "# Use text mode install\ntext\n"
+ elif self.displayMode == DISPLAY_MODE_GRAPHICAL:
+ retval += "# Use graphical install\ngraphical\n"
+
+ return retval
+
+ def parse(self, args):
+ (opts, extra) = self.op.parse_args(args=args, lineno=self.lineno)
+
+ if len(extra) > 0:
+ raise KickstartParseError, formatErrorMsg(self.lineno, msg=_("Kickstart command %s does not take any arguments") % self.currentCmd)
+
+ if self.currentCmd == "cmdline":
+ warnings.warn(_("Deprecated option on line %s: The cmdline is deprecated, text mode will be used. In future releases, this will result in a fatal error from kickstart. Please modify your kickstart file to remove any options.") % self.lineno, DeprecationWarning)
+ self.displayMode = DISPLAY_MODE_TEXT
+ elif self.currentCmd == "graphical":
+ self.displayMode = DISPLAY_MODE_GRAPHICAL
+ elif self.currentCmd == "text":
+ self.displayMode = DISPLAY_MODE_TEXT
+
+ return self
diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py
index 6ffaff0..e9c40ac 100644
--- a/pykickstart/handlers/control.py
+++ b/pykickstart/handlers/control.py
@@ -894,7 +894,7 @@ commandMap = {
"btrfs": btrfs.F17_BTRFS,
"cdrom": method.F14_Method,
"clearpart": clearpart.F17_ClearPart,
- "cmdline": displaymode.FC3_DisplayMode,
+ "cmdline": displaymode.F18_DisplayMode,
"device": device.F8_Device,
"deviceprobe": deviceprobe.FC3_DeviceProbe,
"dmraid": dmraid.FC6_DmRaid,
@@ -902,7 +902,7 @@ commandMap = {
"fcoe": fcoe.F13_Fcoe,
"firewall": firewall.F14_Firewall,
"firstboot": firstboot.FC3_Firstboot,
- "graphical": displaymode.FC3_DisplayMode,
+ "graphical": displaymode.F18_DisplayMode,
"group": group.F12_Group,
"halt": reboot.F18_Reboot,
"harddrive": method.F14_Method,
@@ -931,7 +931,7 @@ commandMap = {
"shutdown": reboot.F18_Reboot,
"skipx": skipx.FC3_SkipX,
"sshpw": sshpw.F13_SshPw,
- "text": displaymode.FC3_DisplayMode,
+ "text": displaymode.F18_DisplayMode,
"timezone": timezone.F18_Timezone,
"updates": updates.F7_Updates,
"upgrade": upgrade.F11_Upgrade,
@@ -1173,7 +1173,7 @@ commandMap = {
"bootloader": bootloader.F17_Bootloader,
"cdrom": method.F14_Method,
"clearpart": clearpart.FC3_ClearPart,
- "cmdline": displaymode.FC3_DisplayMode,
+ "cmdline": displaymode.F18_DisplayMode,
"device": device.F8_Device,
"deviceprobe": deviceprobe.FC3_DeviceProbe,
"dmraid": dmraid.FC6_DmRaid,
@@ -1181,7 +1181,7 @@ commandMap = {
"fcoe": fcoe.F13_Fcoe,
"firewall": firewall.F14_Firewall,
"firstboot": firstboot.FC3_Firstboot,
- "graphical": displaymode.FC3_DisplayMode,
+ "graphical": displaymode.F18_DisplayMode,
"group": group.F12_Group,
"halt": reboot.FC6_Reboot,
"harddrive": method.F14_Method,
@@ -1210,7 +1210,7 @@ commandMap = {
"shutdown": reboot.FC6_Reboot,
"skipx": skipx.FC3_SkipX,
"sshpw": sshpw.F13_SshPw,
- "text": displaymode.FC3_DisplayMode,
+ "text": displaymode.F18_DisplayMode,
"timezone": timezone.FC6_Timezone,
"updates": updates.F7_Updates,
"upgrade": upgrade.F11_Upgrade,
--
1.7.11.2
11 years, 9 months
[PATCH] Only setup python-meh when doing graphical installs
by Jesse Keating
Exception handling in text mode is a "maybe" in the far future, but for
now we want to actually see the traceback so that the user has some clue
what happened.
---
anaconda | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/anaconda b/anaconda
index 1ad68a6..a6bb720 100755
--- a/anaconda
+++ b/anaconda
@@ -916,9 +916,11 @@ if __name__ == "__main__":
anaconda.storage.setupDiskImages()
anaconda.simpleFilter = True
- # comment out the next line to make exceptions non-fatal
- from pyanaconda.exception import initExceptionHandling
- anaconda.mehConfig = initExceptionHandling(anaconda)
+
+ if anaconda.displayMode == 'g':
+ # comment out the next line to make exceptions non-fatal
+ from pyanaconda.exception import initExceptionHandling
+ anaconda.mehConfig = initExceptionHandling(anaconda)
# add our own additional signal handlers
signal.signal(signal.SIGUSR2, lambda signum, frame: anaconda.dumpState())
--
1.7.11.2
11 years, 9 months
[PATCH] Add text entry and completion to the city combobox
by Vratislav Podzimek
This patch modifies the city combobox on the DatetimeSpoke to facilitate
timezone selection in the regions with many cities (timezones). Video preview
can be seen at:
http://vpodzime.fedorapeople.org/DatetimeSpoke-city_completion.webm
Problem I see is that there are two comboboxes with different look. We could:
a) setup the region combobox to use noneditable text entry (same look as the
city combobox, but no additional code needed)
b) implement the whole functionality also for the region combobox
Though being a bit confusing I think a) would be appropriate, because there are
only few regions.
Please refer to the commit message for some additional details.
Vratislav Podzimek (1):
Add entry with completion to the cities combobox (DatetimeSpoke)
pyanaconda/ui/gui/spokes/datetime_spoke.glade | 90 ++++++++++++++++-----------
pyanaconda/ui/gui/spokes/datetime_spoke.py | 40 +++++++++++-
2 files changed, 93 insertions(+), 37 deletions(-)
--
1.7.11.2
11 years, 9 months
[PATCH] Honor displayMode from kickstart files
by Jesse Keating
Loader used to handle this, but it was lost when we moved to dracut.
This adds back the functionality to set cmdline, text, or graphical based
on kickstart contents.
---
dracut/parse-kickstart | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
index 13a0e8f..4a62274 100755
--- a/dracut/parse-kickstart
+++ b/dracut/parse-kickstart
@@ -92,6 +92,15 @@ class Network(commands.network.F16_Network):
netline = ksnet_to_dracut(args, lineno, net, bootdev=True)
return netline
+class DisplayMode(commands.displaymode.FC3_DisplayMode):
+ def dracut_args(self, args, lineno, obj):
+ if self.displayMode == DISPLAY_MODE_CMDLINE:
+ return "inst.cmdline"
+ elif self.displayMode == DISPLAY_MODE_TEXT:
+ return "inst.text"
+ elif self.displayMode == DISPLAY_MODE_GRAPHICAL:
+ return "inst.graphical"
+
# TODO: keymap, lang... device? upgrade? selinux?
dracutCmds = {
@@ -103,6 +112,9 @@ dracutCmds = {
'mediacheck': MediaCheck,
'driverdisk': DriverDisk,
'network': Network,
+ 'cmdline': DisplayMode,
+ 'graphical': DisplayMode,
+ 'text': DisplayMode,
}
handlerclass = returnClassForVersion()
class DracutHandler(handlerclass):
--
1.7.11.2
11 years, 9 months