mirror of
https://abf.rosa.ru/djam/livecd-tools.git
synced 2025-02-23 15:42:58 +00:00
77 lines
2.7 KiB
Diff
77 lines
2.7 KiB
Diff
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
|
|
+++ livecd-tools-18.8/imgcreate/live.py 2012-12-13 17:07:56.699840408 +0400
|
|
@@ -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.
|
|
+menu autoboot Starting boot from local drive in # second{,s}. Press any key to interrupt.
|
|
|
|
#menu clear
|
|
menu title %(title)s
|
|
@@ -569,11 +569,11 @@
|
|
default = self.__is_default_kernel(kernel, kernels)
|
|
|
|
if default:
|
|
- long = "ROSA Desktop 2012"
|
|
+ long = "ROSA Desktop.Fresh 2012"
|
|
elif kernel.startswith("kernel-"):
|
|
- long = "%s (%s)" % ("ROSA Desktop 2012", kernel[7:])
|
|
+ long = "%s (%s)" % ("ROSA Desktop.Fresh 2012", kernel[7:])
|
|
else:
|
|
- long = "%s (%s)" % ("ROSA Desktop 2012", kernel)
|
|
+ long = "%s (%s)" % ("ROSA Desktop.Fresh 2012", kernel)
|
|
|
|
# tell dracut not to ask for LUKS passwords or activate mdraid sets
|
|
if isDracut:
|
|
@@ -621,8 +621,8 @@
|
|
index = index))
|
|
kern_opts = kernel_options
|
|
|
|
- if default:
|
|
- linux[-1] += " menu default\n"
|
|
+# if default:
|
|
+# linux[-1] += " menu default\n"
|
|
|
|
|
|
|
|
@@ -666,7 +666,8 @@
|
|
def __get_local_stanza(self, isodir):
|
|
return """label local
|
|
menu label Boot from local drive
|
|
- localboot 0xffff
|
|
+ menu default
|
|
+ localboot 0x80
|
|
"""
|
|
|
|
def __get_grub2_stanza(self, isodir):
|
|
@@ -697,6 +698,7 @@
|
|
|
|
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"
|
|
@@ -717,7 +719,7 @@
|
|
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)
|
|
|