Novos/salt-statetree
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

try to fix grub 7.9

Browse source
This commit is contained in:
LinuxSquare 2023-07-18 21:46:25 +02:00
parent 970c6cc4a4
commit 7acfbf8def
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
system/disks.sls
View file

@ -24,6 +24,9 @@ system_disks_btrfs_mount_permission:
- group: root
- dir_mode: '0755'
{% set ROOT_UUID = salt['cmd.shell']('lsblk -o LABEL,UUID | grep ROOT | awk \'{print $2}\'') %}
{% set ESP_UUID = salt['cmd.shell']('lsblk -o LABEL,UUID | grep ESP | awk \'{print $2}\'') %}
system_disks_fstab:
file.managed:
- name: /etc/fstab
@ -31,6 +34,8 @@ system_disks_fstab:
- template: jinja
- context:
TIMESTAMP: {{ salt['pillar.get']('timestamp') }}
ROOT_UUID: {{ ROOT_UUID }}
ESP_UUID: {{ ESP_UUID }}
- user: root
- group: root
- mode: '0644'

12
system/files/disks_fstab.jinja
View file

@ -2,9 +2,9 @@
# See fstab(5) for details.
# <file system> <dir> <type> <options> <dump> <pass>
PARTLABEL=ROOT / btrfs noatime,nodiratime,compress=zstd,ssd,discard=async,space_cache=v2,subvol=/@root_{{ TIMESTAMP }} 0 0
PARTLABEL=ESP /efi vfat rw,nosuid,nodev,noexec,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=ascii,shortname=mixed,utf8,errors=remount-ro 0 2
PARTLABEL=ROOT /home btrfs noatime,nodiratime,compress=zstd,ssd,discard=async,space_cache=v2,subvol=/@home 0 0
PARTLABEL=ROOT /var/mysql btrfs noatime,nodiratime,compress=zstd,ssd,discard=async,space_cache=v2,subvol=/@mysql 0 0
PARTLABEL=ROOT /opt/podman btrfs noatime,nodiratime,compress=zstd,ssd,discard=async,space_cache=v2,subvol=/@podman 0 0
PARTLABEL=ROOT /btrfs btrfs noatime,nodiratime,compress=zstd,ssd,discard=async,space_cache=v2,space_cache=v2,subvol=/ 0 0
UUID={{ ROOT_UUID }} / btrfs noatime,nodiratime,compress=zstd,ssd,discard=async,space_cache=v2,subvol=/@root_{{ TIMESTAMP }} 0 0
UUID={{ ESP_UUID }} /efi vfat rw,nosuid,nodev,noexec,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=ascii,shortname=mixed,utf8,errors=remount-ro 0 2
UUID={{ ROOT_UUID }} /home btrfs noatime,nodiratime,compress=zstd,ssd,discard=async,space_cache=v2,subvol=/@home 0 0
UUID={{ ROOT_UUID }} /var/mysql btrfs noatime,nodiratime,compress=zstd,ssd,discard=async,space_cache=v2,subvol=/@mysql 0 0
UUID={{ ROOT_UUID }} /opt/podman btrfs noatime,nodiratime,compress=zstd,ssd,discard=async,space_cache=v2,subvol=/@podman 0 0
UUID={{ ROOT_UUID }} /btrfs btrfs noatime,nodiratime,compress=zstd,ssd,discard=async,space_cache=v2,space_cache=v2,subvol=/ 0 0