From 785f0af02c83d9282c7855b182df037bb19700ff Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Aug 12 2010 19:37:54 +0000 Subject: Have a different new build. --- diff --git a/0001-Update-systemd-s-default.target-for-the-desired-runl.patch b/0001-Update-systemd-s-default.target-for-the-desired-runl.patch new file mode 100644 index 0000000..c6687eb --- /dev/null +++ b/0001-Update-systemd-s-default.target-for-the-desired-runl.patch @@ -0,0 +1,40 @@ +From 48d1e97b2b8c5853e35dea2391b44ae00625b780 Mon Sep 17 00:00:00 2001 +From: Chris Lumens +Date: Wed, 11 Aug 2010 10:38:13 -0400 +Subject: [PATCH 1/6] Update systemd's default.target for the desired runlevel (#623102, mschmidt). + +--- + pyanaconda/desktop.py | 10 +++++++++- + 1 files changed, 9 insertions(+), 1 deletions(-) + +diff --git a/pyanaconda/desktop.py b/pyanaconda/desktop.py +index 49b7bbe..306e481 100644 +--- a/pyanaconda/desktop.py ++++ b/pyanaconda/desktop.py +@@ -19,7 +19,7 @@ + # Author(s): Matt Wilson + # + +-import string ++import string, os + from simpleconfig import SimpleConfigFile + + import logging +@@ -65,6 +65,14 @@ class Desktop (SimpleConfigFile): + inittab.write (line) + inittab.close () + ++ if not os.path.isdir(instPath + '/etc/systemd/system'): ++ log.warning("there is no /etc/systemd/system directory, cannot update default.target!") ++ return ++ default_target = instPath + '/etc/systemd/system/default.target' ++ if os.path.islink(default_target): ++ os.unlink(default_target) ++ os.symlink('/etc/systemd/system/runlevel' + str(self.runlevel) + '.target', default_target) ++ + if self.getDefaultDesktop(): + f = open(instPath + "/etc/sysconfig/desktop", "w") + f.write(str (self)) +-- +1.7.1.1 + diff --git a/0004-Make-sure-nomodeset-and-xdriver-get-passed-on-to-sta.patch b/0004-Make-sure-nomodeset-and-xdriver-get-passed-on-to-sta.patch new file mode 100644 index 0000000..ac9aefd --- /dev/null +++ b/0004-Make-sure-nomodeset-and-xdriver-get-passed-on-to-sta.patch @@ -0,0 +1,49 @@ +From 007bad21878d74600575ed8791a5ecb9dea3c49d Mon Sep 17 00:00:00 2001 +From: Chris Lumens +Date: Wed, 11 Aug 2010 17:02:20 -0400 +Subject: [PATCH 4/6] Make sure "nomodeset" and "xdriver=" get passed on to stage2 (#623129). + +--- + loader/loader.c | 12 ++++++++++-- + 1 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/loader/loader.c b/loader/loader.c +index f14713b..3588bce 100644 +--- a/loader/loader.c ++++ b/loader/loader.c +@@ -1134,7 +1134,9 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData, + splitProxyParam(v, &loaderData->proxyUser, + &loaderData->proxyPassword, &loaderData->proxy); + } +- } else if (numExtraArgs < (MAX_EXTRA_ARGS - 1)) { ++ } ++ ++ if (numExtraArgs < (MAX_EXTRA_ARGS - 1)) { + /* go through and append args we just want to pass on to */ + /* the anaconda script, but don't want to represent as a */ + /* LOADER_FLAGS_XXX since loader doesn't care about these */ +@@ -1153,6 +1155,7 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData, + !strcasecmp(k, "dmraid") || + !strcasecmp(k, "nodmraid") || + !strcasecmp(k, "xdriver") || ++ !strcasecmp(k, "nomodeset") || + !strcasecmp(k, "syslog")) { + + /* vnc implies graphical */ +@@ -1175,7 +1178,12 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData, + flags |= LOADER_FLAGS_EARLY_NETWORKING; + } + +- checked_asprintf(&extraArgs[numExtraArgs],"--%s", k); ++ if (v != NULL) { ++ checked_asprintf(&extraArgs[numExtraArgs], "--%s=%s", k, v) ++ } else { ++ checked_asprintf(&extraArgs[numExtraArgs],"--%s", k); ++ } ++ + numExtraArgs += 1; + + if (numExtraArgs > (MAX_EXTRA_ARGS - 2)) { +-- +1.7.1.1 + diff --git a/0005-I-don-t-need-to-pass-nomodeset-to-stage2-after-all.patch b/0005-I-don-t-need-to-pass-nomodeset-to-stage2-after-all.patch new file mode 100644 index 0000000..a853180 --- /dev/null +++ b/0005-I-don-t-need-to-pass-nomodeset-to-stage2-after-all.patch @@ -0,0 +1,24 @@ +From 6045a6c5ce5a7eae92e80aa13a545af2dceff7be Mon Sep 17 00:00:00 2001 +From: Chris Lumens +Date: Thu, 12 Aug 2010 13:12:16 -0400 +Subject: [PATCH 5/6] I don't need to pass "nomodeset" to stage2 after all. + +--- + loader/loader.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/loader/loader.c b/loader/loader.c +index 3588bce..d09357f 100644 +--- a/loader/loader.c ++++ b/loader/loader.c +@@ -1155,7 +1155,6 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData, + !strcasecmp(k, "dmraid") || + !strcasecmp(k, "nodmraid") || + !strcasecmp(k, "xdriver") || +- !strcasecmp(k, "nomodeset") || + !strcasecmp(k, "syslog")) { + + /* vnc implies graphical */ +-- +1.7.1.1 + diff --git a/anaconda.spec b/anaconda.spec index 8aeb1b0..3c23682 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 14.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -14,6 +14,9 @@ URL: http://fedoraproject.org/wiki/Anaconda # ./autogen.sh # make dist Source0: %{name}-%{version}.tar.bz2 +Patch0: 0001-Update-systemd-s-default.target-for-the-desired-runl.patch +Patch1: 0004-Make-sure-nomodeset-and-xdriver-get-passed-on-to-sta.patch +Patch2: 0005-I-don-t-need-to-pass-nomodeset-to-stage2-after-all.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -164,6 +167,9 @@ system. These files are of little use on an already installed system. %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %configure --disable-static