From bdf7fa6240de1ce673d1e9cf5e07fa2c65084d7f Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Nov 29 2014 02:16:13 +0000 Subject: New snapshot (20141128giteee54241d1f58). * Sat Nov 29 2014 Kevin Kofler - 0.17.0-2.20141128giteee54241d1f58 - New snapshot, sets the machine-id, fixes mounting/unmounting bugs - Rebase default-settings patch --- diff --git a/.gitignore b/.gitignore index a0c5722..b3c93d6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /calamares-01c3244396f3510467f405719ce7ec17403d2d83.tar.gz /calamares-c17898a6501fdd89aba302cd2d1078da18ed8812.tar.gz /calamares-8591dcf731cbfbc9d219244911756460b331c8c3.tar.gz +/calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3.tar.gz diff --git a/calamares-default-settings.patch b/calamares-default-settings.patch index e9796a1..7583e4e 100644 --- a/calamares-default-settings.patch +++ b/calamares-default-settings.patch @@ -1,6 +1,6 @@ -diff -ur calamares-01c3244396f3510467f405719ce7ec17403d2d83/settings.conf calamares-default-settings/settings.conf ---- calamares-01c3244396f3510467f405719ce7ec17403d2d83/settings.conf 2014-11-19 17:20:06.000000000 +0100 -+++ calamares-default-settings/settings.conf 2014-11-20 04:20:00.000000000 +0100 +diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/settings.conf calamares-default-settings/settings.conf +--- calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/settings.conf 2014-11-28 22:32:38.000000000 +0100 ++++ calamares-default-settings/settings.conf 2014-11-29 03:10:33.000000000 +0100 @@ -4,7 +4,7 @@ # Modules can be job modules (with different interfaces) and QtWidgets view modules. # They could all be placed in a number of different paths. @@ -10,7 +10,7 @@ diff -ur calamares-01c3244396f3510467f405719ce7ec17403d2d83/settings.conf calama # We define the module names in the order they should show up (QtWidget view modules, # with one or more pages) OR be executed if enqueued (all other modules). -@@ -38,14 +38,14 @@ +@@ -39,14 +39,14 @@ - locale - keyboard - localecfg @@ -29,16 +29,16 @@ diff -ur calamares-01c3244396f3510467f405719ce7ec17403d2d83/settings.conf calama #- initramfs - grubcfg - grub -@@ -66,4 +66,4 @@ +@@ -67,4 +67,4 @@ # paths relative to the current directory. # Only the name of the branding component (directory) should be specified here, Calamares # then takes care of finding it and loading the contents. -branding: default +branding: auto -diff -ur calamares-01c3244396f3510467f405719ce7ec17403d2d83/src/modules/displaymanager/displaymanager.conf calamares-default-settings/src/modules/displaymanager/displaymanager.conf ---- calamares-01c3244396f3510467f405719ce7ec17403d2d83/src/modules/displaymanager/displaymanager.conf 2014-11-19 17:20:06.000000000 +0100 -+++ calamares-default-settings/src/modules/displaymanager/displaymanager.conf 2014-11-20 04:19:38.000000000 +0100 -@@ -3,10 +3,4 @@ +diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/displaymanager/displaymanager.conf calamares-default-settings/src/modules/displaymanager/displaymanager.conf +--- calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/displaymanager/displaymanager.conf 2014-11-28 22:32:38.000000000 +0100 ++++ calamares-default-settings/src/modules/displaymanager/displaymanager.conf 2014-11-29 03:11:05.000000000 +0100 +@@ -3,13 +3,7 @@ #It also sets up autologin, if the feature is enabled in globalstorage. #The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here. displaymanagers: @@ -49,9 +49,12 @@ diff -ur calamares-01c3244396f3510467f405719ce7ec17403d2d83/src/modules/displaym - - mdm - - lxdm - - kdm -diff -ur calamares-01c3244396f3510467f405719ce7ec17403d2d83/src/modules/grub/grub.conf calamares-default-settings/src/modules/grub/grub.conf ---- calamares-01c3244396f3510467f405719ce7ec17403d2d83/src/modules/grub/grub.conf 2014-11-19 17:20:06.000000000 +0100 -+++ calamares-default-settings/src/modules/grub/grub.conf 2014-11-20 04:19:38.000000000 +0100 + + #Enable followed settings to force a destop environment in your displaymanager configuration file + #default_desktop_environment: +diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/grub/grub.conf calamares-default-settings/src/modules/grub/grub.conf +--- calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/grub/grub.conf 2014-11-28 22:32:38.000000000 +0100 ++++ calamares-default-settings/src/modules/grub/grub.conf 2014-11-29 03:10:33.000000000 +0100 @@ -1,6 +1,6 @@ --- # GRUB 2 binary names and boot directory @@ -62,9 +65,9 @@ diff -ur calamares-01c3244396f3510467f405719ce7ec17403d2d83/src/modules/grub/gru +grubInstall: "grub2-install" +grubMkconfig: "grub2-mkconfig" +grubCfg: "/boot/grub2/grub.cfg" -diff -ur calamares-01c3244396f3510467f405719ce7ec17403d2d83/src/modules/locale/locale.conf calamares-default-settings/src/modules/locale/locale.conf ---- calamares-01c3244396f3510467f405719ce7ec17403d2d83/src/modules/locale/locale.conf 2014-11-19 17:20:06.000000000 +0100 -+++ calamares-default-settings/src/modules/locale/locale.conf 2014-11-20 04:19:38.000000000 +0100 +diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/locale/locale.conf calamares-default-settings/src/modules/locale/locale.conf +--- calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/locale/locale.conf 2014-11-28 22:32:38.000000000 +0100 ++++ calamares-default-settings/src/modules/locale/locale.conf 2014-11-29 03:10:33.000000000 +0100 @@ -1,3 +1,4 @@ --- -region: "Europe" @@ -72,9 +75,9 @@ diff -ur calamares-01c3244396f3510467f405719ce7ec17403d2d83/src/modules/locale/l +# default to UTC +region: "Atlantic" +zone: "Reykjavik" -diff -ur calamares-01c3244396f3510467f405719ce7ec17403d2d83/src/modules/unpackfs/unpackfs.conf calamares-default-settings/src/modules/unpackfs/unpackfs.conf ---- calamares-01c3244396f3510467f405719ce7ec17403d2d83/src/modules/unpackfs/unpackfs.conf 2014-11-19 17:20:06.000000000 +0100 -+++ calamares-default-settings/src/modules/unpackfs/unpackfs.conf 2014-11-20 04:19:38.000000000 +0100 +diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/unpackfs/unpackfs.conf calamares-default-settings/src/modules/unpackfs/unpackfs.conf +--- calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/unpackfs/unpackfs.conf 2014-11-28 22:32:38.000000000 +0100 ++++ calamares-default-settings/src/modules/unpackfs/unpackfs.conf 2014-11-29 03:10:33.000000000 +0100 @@ -1,8 +1,5 @@ --- unpack: @@ -85,9 +88,9 @@ diff -ur calamares-01c3244396f3510467f405719ce7ec17403d2d83/src/modules/unpackfs - - source: "/path/to/another/filesystem.sqfs" - sourcefs: "squashfs" - destination: "" -diff -ur calamares-01c3244396f3510467f405719ce7ec17403d2d83/src/modules/users/users.conf calamares-default-settings/src/modules/users/users.conf ---- calamares-01c3244396f3510467f405719ce7ec17403d2d83/src/modules/users/users.conf 2014-11-19 17:20:06.000000000 +0100 -+++ calamares-default-settings/src/modules/users/users.conf 2014-11-20 04:19:38.000000000 +0100 +diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/users/users.conf calamares-default-settings/src/modules/users/users.conf +--- calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/users/users.conf 2014-11-28 22:32:38.000000000 +0100 ++++ calamares-default-settings/src/modules/users/users.conf 2014-11-29 03:10:33.000000000 +0100 @@ -3,8 +3,7 @@ defaultGroups: - lp diff --git a/calamares.spec b/calamares.spec index 92085e2..069e7df 100644 --- a/calamares.spec +++ b/calamares.spec @@ -1,10 +1,10 @@ -%global snapdate 20141127 -%global snaphash 8591dcf731cbfbc9d219244911756460b331c8c3 +%global snapdate 20141128 +%global snaphash eee54241d1f58839f9d2dc8a64a1a556ff5f70b3 %global partitionmanagerhash 3f1ace00592088a920f731acb1e42417f71f5e62 Name: calamares Version: 0.17.0 -Release: 1.%{snapdate}git%(echo %{snaphash} | cut -c -13)%{?dist} +Release: 2.%{snapdate}git%(echo %{snaphash} | cut -c -13)%{?dist} Summary: Installer from a live CD/DVD/USB to disk License: GPLv3+ @@ -193,6 +193,10 @@ EOF %changelog +* Sat Nov 29 2014 Kevin Kofler - 0.17.0-2.20141128giteee54241d1f58 +- New snapshot, sets the machine-id, fixes mounting/unmounting bugs +- Rebase default-settings patch + * Thu Nov 27 2014 Kevin Kofler - 0.17.0-1.20141127git8591dcf731cbf - New snapshot, adds locale selector, fixes installation with SELinux enabled - Use the version number from CMakeLists.txt, now at 0.17.0 diff --git a/sources b/sources index cd4e45c..659426e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7aefa750bc8838f6f9f16c935fe4f07a calamares-8591dcf731cbfbc9d219244911756460b331c8c3.tar.gz +20751b632785f0a948f7da029eac06b8 calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3.tar.gz 853bb899693b47d43a78e6142d07e235 calamares-partitionmanager-3f1ace00592088a920f731acb1e42417f71f5e62.tar.gz