modified Distroname patch

This commit is contained in:
root 2012-12-13 15:53:50 +04:00
parent 0e321d4e92
commit 1b616d91c4
2 changed files with 16 additions and 6 deletions

View file

@ -12,13 +12,13 @@ diff -Nur livecd-tools-18.8.old/docs/livecd-creator.pod livecd-tools-18.8/docs/l
--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-12 12:51:11.315689187 +0400
+++ livecd-tools-18.8/imgcreate/live.py 2012-12-13 15:52:44.843891727 +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 ROSA Desktop.Fresh 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
@ -37,16 +37,26 @@ diff -Nur livecd-tools-18.8.old/imgcreate/live.py livecd-tools-18.8/imgcreate/li
# tell dracut not to ask for LUKS passwords or activate mdraid sets
if isDracut:
@@ -666,7 +666,7 @@
@@ -622,7 +622,7 @@
kern_opts = kernel_options
if default:
- linux[-1] += " menu default\n"
+# 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 +697,7 @@
@@ -697,6 +698,7 @@
linux, basic, check = self.__get_image_stanzas(isodir)
# Add linux stanzas to main menu
@ -54,7 +64,7 @@ diff -Nur livecd-tools-18.8.old/imgcreate/live.py livecd-tools-18.8/imgcreate/li
for s in linux:
cfg += s
cfg += "menu separator\n"
@@ -717,7 +718,7 @@
@@ -717,7 +719,7 @@
cfg += self.__get_memtest_stanza(isodir)
cfg += "menu separator\n"

View file

@ -5,7 +5,7 @@
Summary: Tools for building live CDs
Name: livecd-tools
Version: 18.8
Release: 18
Release: 19
Epoch: 1
License: GPLv2
Group: System/Base