From 92b134173044971b10843cf0082de4064f20fea4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 11 Apr 2022 12:05:00 +0200 Subject: [PATCH] [users] Document new hostname.location setting - add to schema - add to tests - mention in CHANGES --- CHANGES-3.2 | 4 +++- src/modules/users/Tests.cpp | 9 +++++++++ src/modules/users/users.schema.yaml | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index 8cec4bb78..578590134 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -20,7 +20,9 @@ This release contains contributions from (alphabetically by first name): - *users* module has rearranged configuration for setting the hostname. Legacy settings are preserved, but produce a warning. Please see `users.conf` for details. - + - *users* module has a new hostname.location setting, *Transient*, which + will force the installed system to transient-hostname-setting by removing + the file `/etc/hostname`. # 3.2.54 (2022-03-21) # diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp index 12f96df46..e1c31721a 100644 --- a/src/modules/users/Tests.cpp +++ b/src/modules/users/Tests.cpp @@ -229,6 +229,15 @@ UserTests::testHostActions_data() QTest::newRow( "bad " ) << true << QString( "derp" ) << int( HostNameAction::EtcHostname ); QTest::newRow( "none " ) << true << QString( "none" ) << int( HostNameAction::None ); QTest::newRow( "systemd" ) << true << QString( "Hostnamed" ) << int( HostNameAction::SystemdHostname ); + QTest::newRow( "etc(1) " ) << true << QString( "etcfile" ) << int( HostNameAction::EtcHostname ); + QTest::newRow( "etc(2) " ) << true << QString( "etc" ) << int( HostNameAction::EtcHostname ); + QTest::newRow( "etc-bad" ) + << true << QString( "etchost" ) + << int( HostNameAction::EtcHostname ); // This isn't a valid name, but defaults to EtcHostname + QTest::newRow( "ci-sysd" ) << true << QString( "hOsTnaMed" ) + << int( HostNameAction::SystemdHostname ); // Case-insensitive + QTest::newRow( "trbs " ) << true << QString( "transient" ) << int( HostNameAction::Transient ); + QTest::newRow( "ci-trns" ) << true << QString( "trANSient" ) << int( HostNameAction::Transient ); } void diff --git a/src/modules/users/users.schema.yaml b/src/modules/users/users.schema.yaml index 42ce42b44..c7088253a 100644 --- a/src/modules/users/users.schema.yaml +++ b/src/modules/users/users.schema.yaml @@ -44,7 +44,7 @@ properties: additionalProperties: false type: object properties: - location: { type: string, enum: [ None, EtcFile, Hostnamed ] } + location: { type: string, enum: [ None, EtcFile, Hostnamed, Transient ] } writeHostsFile: { type: boolean, default: true } # Legacy Hostname setting setHostname: { type: string, enum: [ None, EtcFile, Hostnamed ] }