update to new snapshot, post 1.0.0 release from upstream, add OMV config files

.abf.yml

@@ -1,3 +1,3 @@
 sources:
-  calamares-0.17.0-20150120.tar.xz: d61ade1e5bc4d1e1d16d358757113b126200cfe4
+  calamares-1.0.0-20150203.tar.xz: adbd0de2023e5d1e80976eb4f2603807adc7fe1f
   calamares-partitionmanager-20150112.tar.xz: 9fd2828fde3ecb3692868ea186469424c5be580e

calamares-0.17.0-20150112-openmandriva-settings.patch

@@ -1,106 +0,0 @@
-diff -Naur calamares-0.17.0-20150112/settings.conf calamares-0.17.0-20150112.tpg/settings.conf
---- calamares-0.17.0-20150112/settings.conf	2015-01-11 13:53:23.000000000 +0000
-+++ calamares-0.17.0-20150112.tpg/settings.conf	2015-01-12 21:59:55.719975775 +0000
-@@ -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.
- # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
--modules-search: [ local, /path/to/dir/with/more/modules ]
-+modules-search: [ local ]
- 
- # 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).
-@@ -39,18 +39,17 @@
- - locale
- - keyboard
- - localecfg
--- initcpiocfg
--- initcpio
- - users
--#- displaymanager
-+- displaymanager
- - networkcfg
- - hwclock
- - services
--#- dracut
-+- dracut
- #- initramfs
- - grubcfg
- - grub
- #- bootloader
-+- packages
- - umount
- 
- # Phase 3 - postinstall.
-@@ -67,4 +66,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 -Naur calamares-0.17.0-20150112/src/modules/grub/grub.conf calamares-0.17.0-20150112.tpg/src/modules/grub/grub.conf
---- calamares-0.17.0-20150112/src/modules/grub/grub.conf	2015-01-11 13:53:23.000000000 +0000
-+++ calamares-0.17.0-20150112.tpg/src/modules/grub/grub.conf	2015-01-12 22:02:04.588501788 +0000
-@@ -1,11 +1,11 @@
- ---
- # GRUB 2 binary names and boot directory
- # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
--grubInstall: "grub-install"
--grubMkconfig: "grub-mkconfig"
--grubCfg: "/boot/grub/grub.cfg"
-+grubInstall: "grub2-install"
-+grubMkconfig: "grub2-mkconfig"
-+grubCfg: "/boot/grub2/grub.cfg"
- # Optionally set the --bootloader-id to use for EFI. If not set, this defaults
- # to the bootloaderEntryName from branding.desc with problematic characters
- # replaced. If an efiBootloaderId is specified here, it is taken to already be a
- # valid directory name, so no such postprocessing is done in this case.
--# efiBootloaderId: "dirname"
-+efiBootloaderId: "openmandriva"
-diff -Naur calamares-0.17.0-20150112/src/modules/packages/packages.conf calamares-0.17.0-20150112.tpg/src/modules/packages/packages.conf
---- calamares-0.17.0-20150112/src/modules/packages/packages.conf	2015-01-11 13:53:23.000000000 +0000
-+++ calamares-0.17.0-20150112.tpg/src/modules/packages/packages.conf	2015-01-12 22:03:33.478944661 +0000
-@@ -9,7 +9,7 @@
- #  - apt         - APT frontend for DEB and RPM
- #  - pacman      - Pacman
- #
--backend: packagekit
-+backend: urpmi
- #
- # List of maps with package operations such as install or remove.
- # Distro developers can provide a list of packages to remove
-@@ -24,18 +24,6 @@
- # storage called "packageOperations" and it is processed
- # after the static list in the job configuration.
- #
--#operations:
--#  - install:
--#      - pkg1
--#      - pkg2
--#  - remove:
--#      - pkg3
--#      - pkg4
--#  - install:
--#      - pkg5
--#  - remove:
--#      - pkg2
--#      - pkg1
--#    install:
--#      - pkgs6
--#      - pkg7
-+operations:
-+  - remove:
-+    - calamares
-diff -Naur calamares-0.17.0-20150112/src/modules/unpackfs/unpackfs.conf calamares-0.17.0-20150112.tpg/src/modules/unpackfs/unpackfs.conf
---- calamares-0.17.0-20150112/src/modules/unpackfs/unpackfs.conf	2015-01-11 13:53:23.000000000 +0000
-+++ calamares-0.17.0-20150112.tpg/src/modules/unpackfs/unpackfs.conf	2015-01-12 22:06:36.008954515 +0000
-@@ -1,8 +1,5 @@
- ---
- unpack:
--    -   source: "/path/to/filesystem.img"
--        sourcefs: "ext4"
--        destination: ""
--    -   source: "/path/to/another/filesystem.sqfs"
-+    -   source: "/live/media/LiveOS/squashfs.img"
-         sourcefs: "squashfs"
-         destination: ""

calamares-0.17.0-20150112-urpmi-options.patch

@@ -1,12 +0,0 @@
-diff -Naur calamares-0.17.0-20150112/src/modules/packages/main.py calamares-0.17.0-20150112.tpg/src/modules/packages/main.py
---- calamares-0.17.0-20150112/src/modules/packages/main.py	2015-01-11 13:53:23.000000000 +0000
-+++ calamares-0.17.0-20150112.tpg/src/modules/packages/main.py	2015-01-16 21:31:27.425756990 +0000
-@@ -35,7 +35,7 @@
-         elif self.backend == "dnf":
-             check_chroot_call(["dnf", "install", "-y"] + pkgs)
-         elif self.backend == "urpmi":
--            check_chroot_call(["urpmi"] + pkgs)
-+            check_chroot_call(["urpmi", "--download-all", "--no-suggests", "--no-verify-rpm", "--fastunsafe", "--ignoresize", "--nolock", "--auto"] + pkgs)
-         elif self.backend == "apt":
-             check_chroot_call(["apt-get", "-q", "-y", "install"] + pkgs)
-         elif self.backend == "pacman":

calamares.spec

@@ -1,4 +1,4 @@
-%define calamdate 20150120
+%define calamdate 20150203
 %define partdate 20150112
 
 %define major 0
@@ -7,8 +7,8 @@
 
 Summary:	Distribution-independent installer framework 
 Name:		calamares
-Version:	0.17.0
-Release:	0.%{calamdate}.4
+Version:	1.0.0
+Release:	0.%{calamdate}.1
 Group:		System/Configuration/Other
 License:	GPLv3+
 URL:		http://calamares.io/
@@ -17,11 +17,25 @@ Source0:	calamares-%{version}-%{calamdate}.tar.xz
 # https://github.com/calamares/partitionmanager
 Source1:	calamares-partitionmanager-%{partdate}.tar.xz
 Source2:	calamares.rpmlintrc
-Source3:        %{name}.service
-Source4:        %{name}-install-start
-Patch0:		calamares-0.17.0-20150112-openmandriva-settings.patch
+Source3:	%{name}.service
+Source4:	%{name}-install-start
+Source5:	omv-bootloader.conf
+Source6:	omv-displaymanager.conf
+Source7:	omv-finished.conf
+Source8:	omv-fstab.conf
+Source9:	omv-grub.conf
+Source10:	omv-grubcfg.conf
+Source11:	omv-keyboard.conf
+Source12:	omv-locale.conf
+Source13:	omv-machineid.conf
+Source14:	omv-mount.conf
+Source15:	omv-packages.conf
+Source16:	omv-prepare.conf
+Source17:	omv-services.conf
+Source18:	omv-settings.conf
+Source19:	omv-unpackfs.conf
+Source20:	omv-users.conf
 Patch1:		calamares-0.17.0-20150112-openmandriva-desktop-file.patch
-Patch2:		calamares-0.17.0-20150112-urpmi-options.patch
 BuildRequires:	pkgconfig(Qt5Core)
 BuildRequires:	pkgconfig(Qt5DBus)
 BuildRequires:	pkgconfig(Qt5Xml)
@@ -125,7 +139,25 @@ touch %{buildroot}%{_datadir}/calamares/branding/auto/branding.desc
 
 #own the local settings directories
 mkdir -p %{buildroot}%{_sysconfdir}/calamares/modules
-mkdir -p %{buildroot}%{_sysconfdir}/calamares/branding
+mkdir -p %{buildroot}%{_sysconfdir}/calamares/branding/auto
+
+# (tpg) settings specific for OMV
+install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/calamares/modules/bootloader.conf
+install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/calamares/modules/displaymanager.conf
+install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/calamares/modules/finished.conf
+install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/calamares/modules/fstab.conf
+install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/calamares/modules/grub.conf
+install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/calamares/modules/grubcfg.conf
+install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/calamares/modules/keyboard.conf
+install -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/calamares/modules/locale.conf
+install -m 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/calamares/modules/machineid.conf
+install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/calamares/modules/mount.conf
+install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/calamares/modules/packages.conf
+install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/calamares/modules/prepare.conf
+install -m 644 %{SOURCE17} %{buildroot}%{_sysconfdir}/calamares/modules/services.conf
+install -m 644 %{SOURCE18} %{buildroot}%{_sysconfdir}/calamares/settings.conf
+install -m 644 %{SOURCE19} %{buildroot}%{_sysconfdir}/calamares/modules/unpackfs.conf
+install -m 644 %{SOURCE20} %{buildroot}%{_sysconfdir}/calamares/modules/users.conf
 
 # (tpg) service files
 mkdir -p %{buildroot}{%{_unitdir},%{_sbindir}}
@@ -141,7 +173,7 @@ EOF
 # generate the "auto" branding
 . %{_sysconfdir}/os-release
 
-cat >%{_datadir}/calamares/branding/auto/branding.desc <<EOF
+cat >%{_sysconfdir}/calamares/branding/auto/branding.desc <<EOF
 # THIS FILE IS AUTOMATICALLY GENERATED! ANY CHANGES TO THIS FILE WILL BE LOST!
 ---
 componentName:  auto
@@ -169,6 +201,10 @@ EOF
 %dir %{_datadir}/calamares
 %dir %{_datadir}/calamares/branding
 %dir %{_datadir}/calamares/branding/auto
+%dir %{_sysconfdir}/calamares
+%dir %{_sysconfdir}/calamares/modules
+%dir %{_sysconfdir}/calamares/branding
+%dir %{_sysconfdir}/calamares/branding/auto
 %{_presetdir}/90-%{name}.preset
 %{_unitdir}/%{name}.service
 %{_sbindir}/%{name}-install-start
@@ -178,9 +214,10 @@ EOF
 %{_datadir}/calamares/modules/
 %{_datadir}/applications/calamares.desktop
 %{_datadir}/polkit-1/actions/com.github.calamares.calamares.policy
-%{_sysconfdir}/calamares/
+%{_sysconfdir}/calamares/*.conf
+%{_sysconfdir}/calamares/modules/*.conf
 %{_libdir}/calamares/*
-%ghost %{_datadir}/calamares/branding/auto/branding.desc
+%ghost %{_sysconfdir}/calamares/branding/auto/branding.desc
 
 %files -n %{libname}
 %{_libdir}/libcalamares.so.%{major}*

omv-bootloader.conf

@@ -0,0 +1,17 @@
+---
+# Gummiboot configuration files settings, set kernel and initramfs file names
+# and amount of time before default selection boots
+# Optionally set the menu entry name to use in Gummiboot. If not specified here,
+# this setting will be taken from branding.desc.
+# bootloaderEntryName: KaOS-kf5
+kernel: /vmlinuz-linux
+img: /initramfs-linux.img
+fallback: /initramfs-linux-fallback.img
+
+timeout: 10
+
+# GRUB 2 binary names and boot directory
+# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
+grubInstall: "grub2-install"
+grubMkconfig: "grub2-mkconfig"
+grubCfg: "/boot/grub2/grub.cfg"

omv-displaymanager.conf

@@ -0,0 +1,22 @@
+---
+#The DM module attempts to set up all the DMs found in this list, in that precise order.
+#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:
+  - slim
+  - sddm
+  - lightdm
+  - gdm
+  - mdm
+  - lxdm
+  - kdm
+
+#Enable the following settings to force a desktop environment in your displaymanager configuration file:
+#defaultDesktopEnvironment:
+#    executable: "startkde"
+#    desktopFile: "plasma"
+
+#If true, try to ensure that the user, group, /var directory etc. for the
+#display manager are set up correctly. This is normally done by the distribution
+#packages, and best left to them. Therefore, it is disabled by default.
+basicSetup: false

omv-finished.conf

@@ -0,0 +1,4 @@
+---
+restartNowEnabled: true
+restartNowChecked: false
+restartNowCommand: "systemctl -i reboot"

omv-fstab.conf

@@ -0,0 +1,10 @@
+---
+mountOptions:
+    default: defaults,noatime
+    btrfs: defaults,noatime,space_cache,autodefrag
+ssdExtraMountOptions:
+    ext4: discard
+    jfs: discard
+    xfs: discard
+    swap: discard
+    btrfs: discard,compress=lzo

omv-grub.conf

@@ -0,0 +1,11 @@
+---
+# GRUB 2 binary names and boot directory
+# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
+grubInstall: "grub2-install"
+grubMkconfig: "grub2-mkconfig"
+grubCfg: "/boot/grub2/grub.cfg"
+# Optionally set the --bootloader-id to use for EFI. If not set, this defaults
+# to the bootloaderEntryName from branding.desc with problematic characters
+# replaced. If an efiBootloaderId is specified here, it is taken to already be a
+# valid directory name, so no such postprocessing is done in this case.
+efiBootloaderId: "openmandriva"

omv-grubcfg.conf

@@ -0,0 +1,20 @@
+---
+# If set to true, always creates /etc/default/grub from scratch even if the file
+# already existed. If set to false, edits the existing file instead.
+overwrite: false
+# Default entries to write to /etc/default/grub if it does not exist yet or if
+# we are overwriting it. Note that in addition, GRUB_CMDLINE_LINUX_DEFAULT and
+# GRUB_DISTRIBUTOR will always be written, with automatically detected values.
+defaults:
+    GRUB_TIMEOUT: 10
+    GRUB_DEFAULT: "saved"
+    GRUB_DISABLE_SUBMENU: true
+    GRUB_DISABLE_RECOVERY: false
+    GRUB_GFXPAYLOAD: "keep"
+    GRUB_GFXMODE: "1680x1050,1360x786,1280x800,1024x768,1024x600,800x600,640x480"
+    GRUB_CMDLINE_LINUX_DEFAULT: "quiet splash=silent logo.nologo acpi_osi=Linux video.use_native_backlight=1 audit=0"
+    GRUB_CMDLINE_LINUX_RECOVERY: " failsafe nomodest xdriver=vesa vga=788 systemd.log_level=debug systemd.log_target=kmsg log_buf_len=1M audit=0"
+    GRUB_DISABLE_VENDOR_CONF: false
+    GRUB_THEME: "/boot/grub2/themes/OpenMandriva/theme.txt"
+    GRUB_BACKGROUND: "/boot/grub2/themes/OpenMandriva/terminal_background.png"
+    GRUB_DISTRIBUTOR: "OpenMandriva Lx"

omv-keyboard.conf

@@ -0,0 +1,8 @@
+---
+# The name of the file to write X11 keyboard settings to
+# The default value is the name used by upstream systemd-localed.
+# Relative paths are assumed to be relative to /etc/X11/xorg.conf.d
+xOrgConfFileName: "/etc/X11/xorg.conf.d/00-keyboard.conf"
+# The path to search for keymaps converted from X11 to kbd format
+# Leave this empty if the setting does not make sense on your distribution.
+convertedKeymapPath: "/lib/kbd/keymaps/xkb"

omv-locale.conf

@@ -0,0 +1,3 @@
+---
+region:     "Europe"
+zone:       "London"

omv-machineid.conf

@@ -0,0 +1,8 @@
+---
+# Whether to create /etc/machine-id for systemd.
+systemd: true
+# Whether to create /var/lib/dbus/machine-id for D-Bus.
+dbus: true
+# Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
+# (ignored if dbus is false, or if there is no /etc/machine-id to point to).
+symlink: true

omv-mount.conf

@@ -0,0 +1,20 @@
+---
+extraMounts:
+    - device: proc
+      fs: proc
+      mountPoint: /proc
+    - device: sys
+      fs: sysfs
+      mountPoint: /sys
+    - device: /dev
+      mountPoint: /dev
+      options: bind
+    - device: tmpfs
+      fs: tmpfs
+      mountPoint: /run
+
+extraMountsEfi:
+    - device: /sys/firmware/efi
+      mountPoint: /sys/firmware/efi
+      options: bind
+

omv-packages.conf

@@ -0,0 +1,29 @@
+---
+#
+# Which package manager to use, options are:
+#  - packagekit  - PackageKit CLI tool
+#  - zypp        - Zypp RPM frontend
+#  - yum         - Yum RPM frontend
+#  - dnf         - DNF, the new RPM frontend
+#  - urpmi       - Mandriva package manager
+#  - apt         - APT frontend for DEB and RPM
+#  - pacman      - Pacman
+#
+backend: urpmi
+#
+# List of maps with package operations such as install or remove.
+# Distro developers can provide a list of packages to remove
+# from the installed system (for instance packages meant only
+# for the live system).
+#
+# A job implementing a distro specific logic to determine other
+# packages that need to be installed or removed can run before
+# this one. Distro developers may want to install locale packages
+# or remove drivers not needed on the installed system.
+# This job will populate a list of dictionaries in the global
+# storage called "packageOperations" and it is processed
+# after the static list in the job configuration.
+#
+operations:
+  - remove:
+      - calamares

omv-prepare.conf

@@ -0,0 +1,11 @@
+---
+requiredStorage:    2.0
+requiredRam:        1.5
+check:
+    - storage
+    - ram
+    - power
+    - internet
+required:
+    - storage
+    - ram

omv-services.conf

@@ -0,0 +1,13 @@
+---
+#systemd services and targets are enabled in this precise order
+
+services:
+  - name: "NetworkManager"  #name of the service file
+    mandatory: false        #true=> if enabling fails the installer errors out and quits
+                            #false=>if enabling fails print warning to console and continue
+  - name: "cups"
+    mandatory: false
+
+targets:
+  - name: "graphical"
+    mandatory: true

omv-settings.conf

@@ -0,0 +1,68 @@
+# Configuration file for Calamares
+# Syntax is YAML 1.2
+---
+# Modules can be job modules (with different interfaces) and QtWidgets view modules.
+# They could all be placed in a number of different paths.
+# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
+modules-search: [ local ]
+
+# 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).
+# Pages can also enqueue jobs for delayed execution in the order specified for the
+# install phase.
+
+# Phase 1 - prepare.
+# View modules are shown as UI pages, jobs from job modules are executed immediately in
+# the background.
+# Jobs should be executed sparingly (if at all) in this phase.
+prepare:
+- greeting
+- locale
+- keyboard
+- partition
+- prepare
+- users
+- summary
+
+# Phase 2 - install.
+# View modules are not shown. Only the view modules shown in the previous phase are
+# allowed, their names should be added here as placeholders to specify the order in
+# which view module jobs should be enqueued. Job modules are also allowed.
+install:
+#- dummyprocess
+#- dummypython
+- partition
+- mount
+- unpackfs
+- machineid
+- fstab
+- locale
+- keyboard
+- localecfg
+- users
+- displaymanager
+- networkcfg
+- hwclock
+- services
+- dracut
+- grubcfg
+- grub
+- bootloader
+- packages
+- umount
+
+# Phase 3 - postinstall.
+# View modules are shown as UI pages, jobs from job modules are executed immediately in
+# the background.
+# Jobs should be executed sparingly (if at all) in this phase.
+postinstall:
+- finished
+
+
+# A branding component is a directory, either in SHARE/calamares/branding or in
+# /etc/calamares/branding (the latter takes precedence). The directory must contain a
+# YAML file branding.desc which may reference additional resources (such as images) as
+# 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: auto

omv-unpackfs.conf

@@ -0,0 +1,5 @@
+---
+unpack:
+    -   source: "/live/media/LiveOS/squashfs.img"
+        sourcefs: "squashfs"
+        destination: ""

omv-users.conf

@@ -0,0 +1,12 @@
+---
+userGroup:      users
+defaultGroups:
+    - lp
+    - video
+    - network
+    - storage
+    - wheel
+    - audio
+    - sambashare
+autologinGroup: autologin
+sudoersGroup:   wheel