napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release v3.2.4

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iHUEABEIAB0WIQTnwx6uJD15hBW87wASjwCHPgWvHQUCXGLH4QAKCRASjwCHPgWv
 HeCzAP4/cwoZOBtOFAdDy6IlolCC42wAyTdW8NOrA8A7jNmETAD/bIsYGRlVEQeG
 i9CW7IgRLRjlSM+hJPVYY8GYbF3k0Us=
 =0y3i
 -----END PGP SIGNATURE-----

Merge tag 'v3.2.4' of https://github.com/calamares/calamares into development

Release v3.2.4
This commit is contained in:
Philip Müller 2019-02-12 15:43:56 +01:00
commit 870d9200e8
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcalamares/Tests.cpp
View File

@ -62,9 +62,13 @@ void
LibCalamaresTests::testLoadSaveYaml() LibCalamaresTests::testLoadSaveYaml()
{ {
QFile f( "settings.conf" ); QFile f( "settings.conf" );
// Find the nearest settings.conf to read
for ( unsigned int up = 0; !f.exists() && ( up < 4 ); ++up )
f.setFileName( QString( "../" ) + f.fileName() );
cDebug() << QDir().absolutePath() << f.fileName() << f.exists();
QVERIFY( f.exists() ); QVERIFY( f.exists() );
auto map = CalamaresUtils::loadYaml( "settings.conf" ); auto map = CalamaresUtils::loadYaml( f.fileName() );
CalamaresUtils::saveYaml( "out.yaml", map ); CalamaresUtils::saveYaml( "out.yaml", map );
auto other_map = CalamaresUtils::loadYaml( "out.yaml" ); auto other_map = CalamaresUtils::loadYaml( "out.yaml" );

4
src/modules/fsresizer/Tests.cpp
View File

@ -105,9 +105,9 @@ atleast: 127 %
QVERIFY( !j.m_fsname.isEmpty() ); QVERIFY( !j.m_fsname.isEmpty() );
QVERIFY( !j.m_devicename.isEmpty() ); QVERIFY( !j.m_devicename.isEmpty() );
QCOMPARE( j.m_size.unit(), ResizeFSJob::RelativeUnit::Absolute ); QCOMPARE( j.m_size.unit(), ResizeFSJob::RelativeUnit::Absolute );
QCOMPARE( j.m_atleast.unit(), ResizeFSJob::RelativeUnit::Percent ); QCOMPARE( j.m_atleast.unit(), ResizeFSJob::RelativeUnit::None );
QCOMPARE( j.m_size.value(), 72 ); QCOMPARE( j.m_size.value(), 72 );
QCOMPARE( j.m_atleast.value(), 127 ); QCOMPARE( j.m_atleast.value(), 0 );
// Silly config // Silly config
doc0 = YAML::Load( R"(--- doc0 = YAML::Load( R"(---

22
src/modules/rawfs/rawfs.conf
View File

@ -2,23 +2,23 @@
--- ---
# To apply a custom partition layout, it has to be defined this way : # To apply a custom partition layout, it has to be defined as a list of targets.
#
# targets:
# - mountPoint: /
# source: /
# - mountPoint: /home
# source: /images/home.img
# resize: true
# - mountPoint: /data
# source: /dev/mmcblk0p3
# #
# For each target, the following attributes must be defined: # For each target, the following attributes must be defined:
# * mountPoint: The mount point of the destination device on the installed system # * mountPoint: The mount point of the destination device on the installed system
# The corresponding block device will automatically be identified and used as the # The corresponding block device will automatically be identified and used as the
# destination for the operation # destination for the operation
# * source: The source filesystem; it can be the mount point of a locally (on the # * source: The source filesystem; it can be the mount point of a locally (on the
# live system) mounted filesystem, a disk image, or a block device # live system) mounted filesystem, a path to a disk image, or a block device
# * resize (optional): Expand the destination filesystem to fill the whole # * resize (optional): Expand the destination filesystem to fill the whole
# partition at the end of the operation; this works only with ext filesystems # partition at the end of the operation; this works only with ext filesystems
# for now # for now
targets:
- mountPoint: /
source: /
- mountPoint: /home
source: /images/home.img
resize: true
- mountPoint: /data
source: /dev/mmcblk0p3