livecd-tools/livecd-tools-18.8.Distroname.patch

78 lines
2.7 KiB
Diff
Raw Normal View History

2012-12-11 18:31:52 +04:00
diff -Nur livecd-tools-18.8.old/docs/livecd-creator.pod livecd-tools-18.8/docs/livecd-creator.pod
--- livecd-tools-18.8.old/docs/livecd-creator.pod 2012-08-06 22:49:20.000000000 +0400
+++ livecd-tools-18.8/docs/livecd-creator.pod 2012-12-11 18:12:17.856680018 +0400
@@ -79,7 +79,7 @@
livecd-creator \
--config=/usr/share/livecd-tools/livecd-fedora-minimal.ks
-Fedora Desktop Live CD
+Rosa Desktop Live CD
livecd-creator \
--config=/usr/share/livecd-tools/livecd-fedora-desktop.ks \
diff -Nur livecd-tools-18.8.old/imgcreate/live.py livecd-tools-18.8/imgcreate/live.py
--- livecd-tools-18.8.old/imgcreate/live.py 2012-12-11 18:11:47.000000000 +0400
2012-12-13 17:08:24 +04:00
+++ livecd-tools-18.8/imgcreate/live.py 2012-12-13 17:07:56.699840408 +0400
2012-12-11 18:31:52 +04:00
@@ -492,7 +492,7 @@
default %(menu)s
timeout %(timeout)d
menu background %(background)s
-menu autoboot Starting ROSA Desktop 2012 in # second{,s}. Press any key to interrupt.
2012-12-13 15:53:50 +04:00
+menu autoboot Starting boot from local drive in # second{,s}. Press any key to interrupt.
2012-12-11 18:31:52 +04:00
#menu clear
menu title %(title)s
@@ -569,11 +569,11 @@
default = self.__is_default_kernel(kernel, kernels)
if default:
- long = "ROSA Desktop 2012"
2012-12-18 15:03:58 +04:00
+ long = "ROSA Desktop.Fresh 2012"
2012-12-11 18:31:52 +04:00
elif kernel.startswith("kernel-"):
- long = "%s (%s)" % ("ROSA Desktop 2012", kernel[7:])
2012-12-18 15:03:58 +04:00
+ long = "%s (%s)" % ("ROSA Desktop.Fresh 2012", kernel[7:])
2012-12-11 18:31:52 +04:00
else:
- long = "%s (%s)" % ("ROSA Desktop 2012", kernel)
2012-12-18 15:03:58 +04:00
+ long = "%s (%s)" % ("ROSA Desktop.Fresh 2012", kernel)
2012-12-11 18:31:52 +04:00
# tell dracut not to ask for LUKS passwords or activate mdraid sets
if isDracut:
2012-12-13 17:08:24 +04:00
@@ -621,8 +621,8 @@
index = index))
2012-12-13 15:53:50 +04:00
kern_opts = kernel_options
2012-12-13 17:08:24 +04:00
- if default:
2012-12-13 15:53:50 +04:00
- linux[-1] += " menu default\n"
2012-12-13 17:08:24 +04:00
+# if default:
2012-12-13 15:53:50 +04:00
+# linux[-1] += " menu default\n"
@@ -666,7 +666,8 @@
2012-12-11 18:31:52 +04:00
def __get_local_stanza(self, isodir):
return """label local
menu label Boot from local drive
- localboot 0xffff
2012-12-13 15:53:50 +04:00
+ menu default
2012-12-11 18:31:52 +04:00
+ localboot 0x80
"""
def __get_grub2_stanza(self, isodir):
2012-12-13 15:53:50 +04:00
@@ -697,6 +698,7 @@
2012-12-12 12:51:46 +04:00
linux, basic, check = self.__get_image_stanzas(isodir)
# Add linux stanzas to main menu
+ cfg += self.__get_local_stanza(isodir)
for s in linux:
cfg += s
cfg += "menu separator\n"
2012-12-13 15:53:50 +04:00
@@ -717,7 +719,7 @@
2012-12-12 12:51:46 +04:00
cfg += self.__get_memtest_stanza(isodir)
cfg += "menu separator\n"
- cfg += self.__get_local_stanza(isodir)
+# cfg += self.__get_local_stanza(isodir)
cfg += self.__get_grub2_stanza(isodir)
cfg += self._get_isolinux_stanzas(isodir)