From f0a2027393be2c73ece30b4ffb7d0aa3df65d8c6 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Thu, 19 Apr 2012 01:00:34 +0200 Subject: [PATCH 01/16] makefile: call isohybrid on created image (#440) --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 13982cf..29b8c87 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,7 @@ iso: cp rpm_verify /usr/local/bin/ ln -sf `pwd` /tmp/qubes-installer revisor --cli --config=conf/qubes-install.conf --model=qubes-x86_64 --install-dvd + isohybrid build/ISO/qubes-x86_64/iso/*.iso rpm_verify build/work/revisor-install/R1-*/qubes-x86_64/x86_64/os/Packages/*.rpm clean: From 61f878c20228f869d14e8a0d4e321d79b9fb8909 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Tue, 17 Apr 2012 16:29:38 +0200 Subject: [PATCH 02/16] Makefile: correct path used by rpm_verify (R1->R?) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 29b8c87..a17f45b 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ iso: ln -sf `pwd` /tmp/qubes-installer revisor --cli --config=conf/qubes-install.conf --model=qubes-x86_64 --install-dvd isohybrid build/ISO/qubes-x86_64/iso/*.iso - rpm_verify build/work/revisor-install/R1-*/qubes-x86_64/x86_64/os/Packages/*.rpm + rpm_verify build/work/revisor-install/R?-*/qubes-x86_64/x86_64/os/Packages/*.rpm clean: rm -fr rpm/SOURCES/*.bz2 From 57a46a7c012c521054475dd5c0c35f9953d0d93f Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Thu, 19 Apr 2012 14:22:25 +0200 Subject: [PATCH 03/16] qubes-release: import key only on upgrade Installer will import all keys at the end itself. --- qubes-release/qubes-release.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qubes-release/qubes-release.spec b/qubes-release/qubes-release.spec index 12c0f4a..977aa39 100644 --- a/qubes-release/qubes-release.spec +++ b/qubes-release/qubes-release.spec @@ -75,7 +75,9 @@ EOF # On Mar 31, 2012, the Qubes signing key has changed # The new key is brought by this RPM, but we also # need to explicitly import it to RPM DB -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary +if [ $1 -gt 1 ]; then + rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary +fi %clean From 6a392e41d1e467579cb4e0ccb58036d91bcb3938 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 28 Apr 2012 02:36:58 +0200 Subject: [PATCH 04/16] revisor: fix DVD label - remove quotes --- revisor/revisor-2.2-volume-label.patch | 12 ++++++++++++ revisor/revisor.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 revisor/revisor-2.2-volume-label.patch diff --git a/revisor/revisor-2.2-volume-label.patch b/revisor/revisor-2.2-volume-label.patch new file mode 100644 index 0000000..9669597 --- /dev/null +++ b/revisor/revisor-2.2-volume-label.patch @@ -0,0 +1,12 @@ +diff -ru revisor-2.2.orig/revisor/pungi.py revisor-2.2/revisor/pungi.py +--- revisor-2.2.orig/revisor/pungi.py 2010-06-04 15:36:04.000000000 +0200 ++++ revisor-2.2/revisor/pungi.py 2012-04-28 02:32:04.675002111 +0200 +@@ -584,7 +584,7 @@ + if mt["discs"] > 1: + volume = "%s%d" % (volume, disc) + +- extraargs.extend(['"%s"' % volume]) ++ extraargs.extend(['%s' % volume]) + extraargs.extend(['-o', isofile]) + + if not self.cfg.include_bootiso: diff --git a/revisor/revisor.spec b/revisor/revisor.spec index 7009174..9f0f04b 100644 --- a/revisor/revisor.spec +++ b/revisor/revisor.spec @@ -132,6 +132,7 @@ Provides: revisor-wui = %{version}-%{release} Source100: F13-buildinstall Patch100: revisor-2.2-comps.patch Patch101: revisor-2.2-release.patch +Patch102: revisor-2.2-volume-label.patch %description cli Revisor provides a set of graphical tools for building customized, updated @@ -354,6 +355,7 @@ This is the Revisor Web User Interface package %setup -q %patch100 -p1 %patch101 -p1 +%patch102 -p1 %build %configure From 7723f59b703afa86dafda61da520e99f50f92f45 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 28 Apr 2012 02:42:03 +0200 Subject: [PATCH 05/16] revisor 2.2-5 --- revisor/revisor.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/revisor/revisor.spec b/revisor/revisor.spec index 9f0f04b..7faff3b 100644 --- a/revisor/revisor.spec +++ b/revisor/revisor.spec @@ -19,7 +19,7 @@ Summary: Fedora "Spin" Graphical User Interface Name: revisor Version: 2.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/System URL: http://fedorahosted.org/revisor From ba1ff47849e0ee00b946e407696bbd038270caab Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 28 Apr 2012 02:43:05 +0200 Subject: [PATCH 06/16] anaconda: use correct disk label (#440) --- anaconda/scripts/mk-images.x86 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anaconda/scripts/mk-images.x86 b/anaconda/scripts/mk-images.x86 index 09fc9ae..39fb142 100644 --- a/anaconda/scripts/mk-images.x86 +++ b/anaconda/scripts/mk-images.x86 @@ -18,7 +18,7 @@ # SYSLINUX=$IMGPATH/usr/share/syslinux/syslinux-nomtools -CDLABEL=$PRODUCT +CDLABEL="$PRODUCT $VERSION x86_64 DVD" if [ ! -f $SYSLINUX ]; then echo "Warning: nomtools syslinux doesn't exist" From 5fd3c8b1515a1bd0bba0fa64c2d5216dd6a9a241 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 28 Apr 2012 02:45:52 +0200 Subject: [PATCH 07/16] anaconda: try to use installation disk directly, before searching for ISO images (#440) --- anaconda/loader/loader.c | 70 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 2 deletions(-) diff --git a/anaconda/loader/loader.c b/anaconda/loader/loader.c index a601f0f..d22d51e 100644 --- a/anaconda/loader/loader.c +++ b/anaconda/loader/loader.c @@ -1232,9 +1232,75 @@ static char *doLoaderMain(struct loaderData_s *loaderData, * That will also then bypass any method selection UI in loader. */ if (!FL_ASKMETHOD(flags)) { - url = findAnacondaCD("/mnt/stage2"); + int stage2ok = 0; + // marmarek hack for USB install + if (loaderData->method == METHOD_HD) { + char *location = "/mnt/stage2"; + char *device = ((struct hdInstallData *)loaderData->stage2Data)->partition; + char *stage2loc = "/mnt/stage2/images/install.img"; + char *stage2img; + int stage2inram; + + if (!(rc=doPwMount(device, location, "auto", "ro", NULL))) { + if (!access(stage2loc, R_OK)) { + char *updpath; + + //TODO? queryCDMediaCheck(device, location); + + /* if in rescue mode lets copy stage 2 into RAM so we can */ + /* free up the CD drive and user can have it avaiable to */ + /* aid system recovery. */ + if (FL_RESCUE(flags) && !FL_TEXT(flags) && + totalMemory() > MIN_GUI_RAM ) { + rc = copyFile(stage2loc, "/tmp/install.img"); + stage2img = strdup("/tmp/install.img"); + stage2inram = 1; + } else { + stage2img = strdup(stage2loc); + stage2inram = 0; + } + + rc = mountStage2(stage2img); + free(stage2img); + + if (!rc) { + checked_asprintf(&updpath, "%s/images/updates.img", location); + + logMessage(INFO, "Looking for updates in %s", updpath); + copyUpdatesImg(updpath); + free(updpath); + + checked_asprintf(&updpath, "%s/images/product.img", location); + + logMessage(INFO, "Looking for product in %s", updpath); + copyProductImg(updpath); + free(updpath); + + /* if in rescue mode and we copied stage2 to RAM */ + /* we can now unmount the CD */ + if (FL_RESCUE(flags) && stage2inram) { + umount(location); + } + stage2ok = 1; + checked_asprintf(&url, "file://%s", location); + } else { + logMessage(INFO, "mounting stage2 failed"); + umount(location); + } + } else { + /* this wasnt the CD we were looking for, clean up and */ + /* try the next CD drive */ + umount(location); + } + } else { + logMessage(WARNING, "Mount failed for %s at %s", device, location); + } + } + if (!url) + url = findAnacondaCD("/mnt/stage2"); if (url) { - setStage2LocFromCmdline(url, loaderData); + if (!stage2ok) + setStage2LocFromCmdline(url, loaderData); skipMethodDialog = 1; logMessage(INFO, "Detected stage 2 image on CD (url: %s)", url); From 0d804af891d0bea61048b734da572d4cad271ccd Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 28 Apr 2012 02:46:10 +0200 Subject: [PATCH 08/16] anaconda: use packages from already mounted /mnt/stage2 if commanded so (#440) --- anaconda/backend.py | 2 +- anaconda/scripts/mk-images.x86 | 2 +- anaconda/yuminstall.py | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/anaconda/backend.py b/anaconda/backend.py index 2ec2109..713278b 100644 --- a/anaconda/backend.py +++ b/anaconda/backend.py @@ -188,7 +188,7 @@ class AnacondaBackend: return 1 isys.lochangefd("/dev/loop0", self._loopbackFile) - if os.path.ismount("/mnt/stage2"): + if os.path.ismount("/mnt/stage2") and not anaconda.methodstr.find("/mnt/stage2") >= 0: isys.umount("/mnt/stage2") def removeInstallImage(self): diff --git a/anaconda/scripts/mk-images.x86 b/anaconda/scripts/mk-images.x86 index 39fb142..228da60 100644 --- a/anaconda/scripts/mk-images.x86 +++ b/anaconda/scripts/mk-images.x86 @@ -100,7 +100,7 @@ makeBootImages() { # insert XEN boot options sed -i 's/kernel vmlinuz/kernel mboot.c32/' $MBD_BOOTTREE/isolinux.cfg - sed -i "s/append initrd=[^ ]*\(.*\)/append $xenimage --- $kernelimage stage2=hd:LABEL=\"$CDLABEL\"\1 --- $initrd/" $MBD_BOOTTREE/isolinux.cfg + sed -i "s/append initrd=[^ ]*\(.*\)/append $xenimage --- $kernelimage stage2=hd:LABEL=\"$CDLABEL\":\/images\/install.img repo=file:\/mnt\/stage2\1 --- $initrd/" $MBD_BOOTTREE/isolinux.cfg # copy in memtest if present if [ -f $IMGPATH/usr/lib/anaconda-runtime/boot/memtest* ]; then diff --git a/anaconda/yuminstall.py b/anaconda/yuminstall.py index ff9c7a3..478bbae 100644 --- a/anaconda/yuminstall.py +++ b/anaconda/yuminstall.py @@ -492,6 +492,10 @@ class AnacondaYum(YumSorter): self._switchCD(1) self.mediagrabber = self.mediaHandler self._baseRepoURL = "file://%s" % self.tree + elif m.startswith("file:"): + self.tree = m[5:] + self._baseRepoURL = "file://%s" % self.tree + else: # No methodstr was given. In order to find an installation source, # we should first check to see if there's a CD/DVD with packages From 73352d64380f66ebf3d3068b8bd0803910f1c1cd Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 28 Apr 2012 02:46:58 +0200 Subject: [PATCH 09/16] anaconda 13.42-3 --- anaconda/anaconda.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anaconda/anaconda.spec b/anaconda/anaconda.spec index ae21020..484e647 100644 --- a/anaconda/anaconda.spec +++ b/anaconda/anaconda.spec @@ -4,7 +4,7 @@ Summary: Graphical system installer Name: anaconda Version: 13.42 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1000 License: GPLv2+ Group: Applications/System From 3f27c3538e889c998dee7681c5e13f21e191625e Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 7 Jul 2012 01:59:19 +0200 Subject: [PATCH 10/16] typo fixes --- conf/comps-qubes.xml | 2 +- conf/qubes-install.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml index 765f0fe..f7ba76a 100644 --- a/conf/comps-qubes.xml +++ b/conf/comps-qubes.xml @@ -83,7 +83,7 @@ kdeaccessibility kdm mesa-libEGL - oxygen-icons-theme + oxygen-icon-theme qubes-kde-dom0 redhat-menus xsettings-kde diff --git a/conf/qubes-install.conf b/conf/qubes-install.conf index 0635d13..86f2860 100644 --- a/conf/qubes-install.conf +++ b/conf/qubes-install.conf @@ -38,7 +38,7 @@ revisor_comps = 1 comps = /tmp/qubes-installer/conf/comps-qubes.xml destination_directory = /tmp/qubes-installer/build/ISO -working_directory = /tmp/qubes-installer/build/work +working_directory = /tmp/qubes-installer/build/work/ ## Models From 166b6f5d4cb8538cf38e082f39838e02806a6ad9 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 7 Jul 2012 02:34:27 +0200 Subject: [PATCH 11/16] virtual package to install multiple kernel versions --- Makefile | 6 +++++- conf/comps-qubes.xml | 2 +- misc/kernel-qubes-dom0-virtual.spec | 31 +++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 misc/kernel-qubes-dom0-virtual.spec diff --git a/Makefile b/Makefile index a17f45b..b9c7706 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ help: .PHONY: rpms rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_revisor \ update-repo update-repo-testing clean -rpms: rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_revisor +rpms: rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_revisor rpms_misc rpm --addsign `ls -d rpm/x86_64/*.rpm rpm/i686/*.rpm rpm/noarch/*.rpm 2>/dev/null` rpm/SOURCES/anaconda-$(ANACONDA_VERSION).tar.bz2: anaconda anaconda/anaconda.spec @@ -84,9 +84,13 @@ rpms_release: rpm/SOURCES/qubes-release-$(QBSRELEASE_VERSION).tar.bz2 rpms_revisor: revisor/revisor-$(REVISOR_VERSION).tar.gz revisor/revisor.spec rpmbuild --define "_rpmdir rpm/" --define "_sourcedir $(TOP)/revisor" -bb revisor/revisor.spec +rpms_misc: + rpmbuild $(RPMBUILD_DEFINES) -bb misc/kernel-qubes-dom0-virtual.spec + RPMS = rpm/noarch/qubes-logos-$(QBSLOGOS_VERSION)-*.rpm \ rpm/noarch/qubes-release-$(QBSRELEASE_VERSION)-*.rpm \ rpm/noarch/revisor*-$(REVISOR_VERSION)-*.rpm \ + rpm/noarch/kernel-qubes-dom0-virtual-1.0-*.rpm \ rpm/x86_64/anaconda-$(ANACONDA_VERSION)-*.rpm \ rpm/x86_64/firstboot-$(FIRSTBOOT_VERSION)-*.rpm diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml index f7ba76a..0ce963e 100644 --- a/conf/comps-qubes.xml +++ b/conf/comps-qubes.xml @@ -94,7 +94,7 @@ Qubes Environment true - kernel-qubes-dom0 + kernel-qubes-dom0-virtual qubes-core-dom0 qubes-gui-dom0 qubes-logos diff --git a/misc/kernel-qubes-dom0-virtual.spec b/misc/kernel-qubes-dom0-virtual.spec new file mode 100644 index 0000000..1e4440d --- /dev/null +++ b/misc/kernel-qubes-dom0-virtual.spec @@ -0,0 +1,31 @@ +Name: kernel-qubes-dom0-virtual +Version: 1.0 +Release: 1%{?dist} +Summary: Virtual package to install Qubes kernels set +BuildArch: noarch + +Group: System +License: GPL +URL: http://www.qubes-os.org/ + +Requires: kernel-qubes-dom0-pvops +Requires: kernel-qubes-dom0-xenlinux + +%description +Package to workaround revisor limitation - packages must be specified by its +name, not provides. + +%prep + + +%build + + +%install + + +%files + + +%changelog + From dfe853fb9d369be558bba8f24f49271f7a3106d9 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Mon, 9 Jul 2012 13:46:03 +0200 Subject: [PATCH 12/16] Revert "virtual package to install multiple kernel versions" This reverts commit 166b6f5d4cb8538cf38e082f39838e02806a6ad9. This didn't work (break anaconda dependecy resolve). --- Makefile | 6 +----- conf/comps-qubes.xml | 2 +- misc/kernel-qubes-dom0-virtual.spec | 31 ----------------------------- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 misc/kernel-qubes-dom0-virtual.spec diff --git a/Makefile b/Makefile index b9c7706..a17f45b 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ help: .PHONY: rpms rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_revisor \ update-repo update-repo-testing clean -rpms: rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_revisor rpms_misc +rpms: rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_revisor rpm --addsign `ls -d rpm/x86_64/*.rpm rpm/i686/*.rpm rpm/noarch/*.rpm 2>/dev/null` rpm/SOURCES/anaconda-$(ANACONDA_VERSION).tar.bz2: anaconda anaconda/anaconda.spec @@ -84,13 +84,9 @@ rpms_release: rpm/SOURCES/qubes-release-$(QBSRELEASE_VERSION).tar.bz2 rpms_revisor: revisor/revisor-$(REVISOR_VERSION).tar.gz revisor/revisor.spec rpmbuild --define "_rpmdir rpm/" --define "_sourcedir $(TOP)/revisor" -bb revisor/revisor.spec -rpms_misc: - rpmbuild $(RPMBUILD_DEFINES) -bb misc/kernel-qubes-dom0-virtual.spec - RPMS = rpm/noarch/qubes-logos-$(QBSLOGOS_VERSION)-*.rpm \ rpm/noarch/qubes-release-$(QBSRELEASE_VERSION)-*.rpm \ rpm/noarch/revisor*-$(REVISOR_VERSION)-*.rpm \ - rpm/noarch/kernel-qubes-dom0-virtual-1.0-*.rpm \ rpm/x86_64/anaconda-$(ANACONDA_VERSION)-*.rpm \ rpm/x86_64/firstboot-$(FIRSTBOOT_VERSION)-*.rpm diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml index 0ce963e..f7ba76a 100644 --- a/conf/comps-qubes.xml +++ b/conf/comps-qubes.xml @@ -94,7 +94,7 @@ Qubes Environment true - kernel-qubes-dom0-virtual + kernel-qubes-dom0 qubes-core-dom0 qubes-gui-dom0 qubes-logos diff --git a/misc/kernel-qubes-dom0-virtual.spec b/misc/kernel-qubes-dom0-virtual.spec deleted file mode 100644 index 1e4440d..0000000 --- a/misc/kernel-qubes-dom0-virtual.spec +++ /dev/null @@ -1,31 +0,0 @@ -Name: kernel-qubes-dom0-virtual -Version: 1.0 -Release: 1%{?dist} -Summary: Virtual package to install Qubes kernels set -BuildArch: noarch - -Group: System -License: GPL -URL: http://www.qubes-os.org/ - -Requires: kernel-qubes-dom0-pvops -Requires: kernel-qubes-dom0-xenlinux - -%description -Package to workaround revisor limitation - packages must be specified by its -name, not provides. - -%prep - - -%build - - -%install - - -%files - - -%changelog - From cabe94affbcd76337dbf7524cab5ea7501ad609a Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Mon, 9 Jul 2012 15:02:40 +0200 Subject: [PATCH 13/16] anaconda: do not fallback to text mode install when Xorg failed Text mode provide very limited UI widget set and almost not existing error reporting, which can result in broken installation. --- anaconda/anaconda | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/anaconda/anaconda b/anaconda/anaconda index 0f54d65..bb5bed5 100755 --- a/anaconda/anaconda +++ b/anaconda/anaconda @@ -1113,10 +1113,13 @@ if __name__ == "__main__": doStartupX11Actions(opts.runres) xserver_pid = proc.pid except (OSError, RuntimeError): - stdoutLog.warning(" X startup failed, falling back to text mode") - anaconda.displayMode = 't' - graphical_failed = 1 + stdoutLog.warning(" X startup failed, aborting installation") time.sleep(2) + sys.exit(1) + #stdoutLog.warning(" X startup failed, falling back to text mode") + #anaconda.displayMode = 't' + #graphical_failed = 1 + #time.sleep(2) finally: signal.signal(signal.SIGUSR1, old_sigusr1) signal.signal(signal.SIGCHLD, old_sigchld) From 93bea9fad55d88adb4cf84579d3b74d949304686 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Mon, 9 Jul 2012 15:04:37 +0200 Subject: [PATCH 14/16] makefile: ensure that SOURCES dir exists --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a17f45b..1c48190 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ RPMBUILD_DEFINES := --define "_rpmdir rpm/" --define "_sourcedir $(TOP)/rpm/SOUR spec_version = $(shell sed -n '/^Version:/s/.*:[ \t]\+//p' $(1)) package = $(shell \ + mkdir -p rpm/SOURCES; \ cd rpm/SOURCES; \ rm -f $(1)-$(2)*; \ ln -s ../../$(1) $(1)-$(2); \ From c9a92d8e34daa0ee4625dde45247271a64224c3d Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Mon, 9 Jul 2012 15:32:48 +0200 Subject: [PATCH 15/16] anaconda: add missing files to installation image --- anaconda/scripts/upd-instroot | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/anaconda/scripts/upd-instroot b/anaconda/scripts/upd-instroot index 7ba06df..d274db4 100755 --- a/anaconda/scripts/upd-instroot +++ b/anaconda/scripts/upd-instroot @@ -366,6 +366,8 @@ etc/hosts etc/im_palette.pal etc/imrc etc/iscsid.conf +etc/ld.so.conf +etc/ld.so.conf.d/* etc/man.config etc/mke2fs.conf etc/netconfig @@ -390,6 +392,7 @@ etc/shells etc/sysconfig/network-scripts/network-functions* etc/udev etc/wpa_supplicant/wpa_supplicant.conf +etc/X11/fontpath.d etc/yum.repos.d/* etc/yum/pluginconf.d/blacklist.conf etc/yum/pluginconf.d/fedorakmod.conf @@ -629,11 +632,13 @@ usr/share/fonts/*/lklug.ttf usr/share/fonts/lohit*/* usr/share/fonts/*/lklug.ttf usr/share/fonts/cjkuni*/uming*.ttc +usr/share/fonts/default usr/share/fonts/dejavu/DejaVuSans-Bold.ttf usr/share/fonts/dejavu/DejaVuSans.ttf usr/share/fonts/dejavu/DejaVuSansMono.ttf usr/share/fonts/kacst/KacstFarsi.ttf usr/share/fonts/kacst/KacstQura.ttf +usr/share/fonts/liberation usr/share/fonts/madan/Madan.ttf usr/share/fonts/un-core/UnDotum.ttf usr/share/fonts/*/VL-Gothic-Regular.ttf From f7d565890716be2e8297393f32100e78f4260a95 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Mon, 9 Jul 2012 15:33:57 +0200 Subject: [PATCH 16/16] anaconda 13.42-4 --- anaconda/anaconda.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anaconda/anaconda.spec b/anaconda/anaconda.spec index 484e647..0720769 100644 --- a/anaconda/anaconda.spec +++ b/anaconda/anaconda.spec @@ -4,7 +4,7 @@ Summary: Graphical system installer Name: anaconda Version: 13.42 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1000 License: GPLv2+ Group: Applications/System