Skip to content

Commit

Permalink
Merge pull request #282 from yast/huha-drop-transact-leap-15-6
Browse files Browse the repository at this point in the history 
Remove 'Transactional Server' System Role [openSUSE-15_6]
  • Loading branch information
@shundhammer
shundhammer committed Mar 25, 2024
2 parents 669efee + b854663 commit 34ed8ce
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 139 deletions.
138 changes: 0 additions & 138 deletions control/control.openSUSE.xml
View file
Expand Up @@ -441,136 +441,6 @@ textdomain="control"
</software>
<order config:type="integer">300</order>
</system_role>

<system_role>
<id>serverro</id>
<globals>
<firewall_enable_ssh config:type="boolean">true</firewall_enable_ssh>
<enable_sshd config:type="boolean">true</enable_sshd>
</globals>
<software>
<default_patterns>transactional_base</default_patterns>
</software>
<order config:type="integer">400</order>
<partitioning>
<expert_partitioner_warning config:type="boolean">true</expert_partitioner_warning>

<proposal>
<lvm config:type="boolean">false</lvm>
</proposal>

<volumes config:type="list">
<!-- / volume: 20 GiB - unlimited -->
<volume>
<mount_point>/</mount_point>
<fs_type>btrfs</fs_type>

<desired_size config:type="disksize">40 GiB</desired_size>
<min_size config:type="disksize">20 GiB</min_size>
<max_size config:type="disksize">unlimited</max_size>
<weight config:type="integer">30</weight>

<!-- Always use snapshots, no matter what -->
<snapshots config:type="boolean">true</snapshots>
<snapshots_configurable config:type="boolean">false</snapshots_configurable>

<!-- You don't want to miss the / volume -->
<proposed_configurable config:type="boolean">false</proposed_configurable>

<!-- the default subvolume "@" was requested by product management -->
<btrfs_default_subvolume>@</btrfs_default_subvolume>

<!-- root filesystem should be read-only -->
<btrfs_read_only config:type="boolean">true</btrfs_read_only>

<!-- subvolumes to be created for a Btrfs root file system -->
<!-- copy_on_write is true by default -->
<subvolumes config:type="list">
<subvolume>
<path>home</path>
</subvolume>
<subvolume>
<path>opt</path>
</subvolume>
<subvolume>
<path>root</path>
</subvolume>
<subvolume>
<path>srv</path>
</subvolume>
<subvolume>
<path>tmp</path>
</subvolume>
<subvolume>
<path>usr/local</path>
</subvolume>
<!-- unified var subvolume - https://lists.opensuse.org/opensuse-packaging/2017-11/msg00017.html -->
<subvolume>
<path>var</path>
<copy_on_write config:type="boolean">false</copy_on_write>
</subvolume>

<!-- architecture specific subvolumes -->

<subvolume>
<path>boot/grub2/i386-pc</path>
<archs>i386,x86_64</archs>
</subvolume>
<subvolume>
<path>boot/grub2/x86_64-efi</path>
<archs>x86_64</archs>
</subvolume>
<subvolume>
<path>boot/grub2/powerpc-ieee1275</path>
<archs>ppc,!board_powernv</archs>
</subvolume>
<subvolume>
<path>boot/grub2/s390x-emu</path>
<archs>s390</archs>
</subvolume>
<subvolume>
<path>boot/grub2/arm64-efi</path>
<archs>aarch64</archs>
</subvolume>
</subvolumes>
</volume>

<!-- separate /home: 10 GiB - unlimited -->
<volume>
<mount_point>/home</mount_point>
<fs_type>xfs</fs_type>

<proposed config:type="boolean">false</proposed>
<proposed_configurable config:type="boolean">true</proposed_configurable>

<desired_size config:type="disksize">40 GiB</desired_size>
<min_size config:type="disksize">10 GiB</min_size>
<max_size config:type="disksize">unlimited</max_size>
<weight config:type="integer">60</weight>

<disable_order config:type="integer">1</disable_order>
</volume>

<!-- swap: 1 GiB - 2 GiB, but at least RAM size -->
<volume>
<mount_point>swap</mount_point>
<fs_type>swap</fs_type>

<proposed_configurable config:type="boolean">true</proposed_configurable>

<desired_size config:type="disksize">2 GiB</desired_size>
<min_size config:type="disksize">1 GiB</min_size>
<max_size config:type="disksize">2 GiB</max_size>
<weight config:type="integer">10</weight>
<adjust_by_ram config:type="boolean">false</adjust_by_ram>
<adjust_by_ram_configurable config:type="boolean">true</adjust_by_ram_configurable>

<disable_order config:type="integer">2</disable_order>
</volume>

</volumes>
</partitioning>
</system_role>
</system_roles>

<clone_modules config:type="list">
Expand Down Expand Up @@ -665,14 +535,6 @@ configured accordingly to match the use case of the role. &lt;/p&gt;</label>
<server_description>
<label>Small set of packages suitable for servers with a text mode interface.</label>
</server_description>
<serverro>
<!-- TRANSLATORS: a label for a system role -->
<label>Transactional Server</label>
</serverro>
<serverro_description>
<label>Like the Server role but uses a read-only root filesystem to provide atomic, automatic updates of a system without interfering with the running system.
</label>
</serverro_description>
</texts>

<proposals config:type="list">
Expand Down
6 changes: 6 additions & 0 deletions package/skelcd-control-openSUSE.changes
View file
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 25 10:43:24 UTC 2024 - Stefan Hundhammer <shundhammer@suse.com>

- Removed 'transactional server' system role (bsc#1221742)
- 15.6.1

-------------------------------------------------------------------
Wed Sep 20 12:31:53 UTC 2023 - Stefan Hundhammer <shundhammer@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion package/skelcd-control-openSUSE.spec
View file
Expand Up @@ -27,7 +27,7 @@
#
######################################################################
Name: skelcd-control-openSUSE
Version: 15.6.0
Version: 15.6.1
Release: 0
Summary: The openSUSE Installation Control file
License: MIT
Expand Down

0 comments on commit 34ed8ce

Please sign in to comment.