From 8b2f42108404c82d02b2c6190908fd8f34c88ead Mon Sep 17 00:00:00 2001 From: LinuxSquare <7436714-OfficialLinuxSquare@users.noreply.gitlab.com> Date: Wed, 20 Sep 2023 21:09:26 +0200 Subject: [PATCH] Add network.sls, edit fstab, begin of noveriablcgen to generate grub boot-entries --- system/files/disks_fstab.jinja | 2 +- system/init.sls | 1 + top.sls | 1 + util/files/noveriablcgen.jinja.sh | 1 + util/init.sls | 2 ++ util/noveriablcgen.sls | 0 6 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 util/files/noveriablcgen.jinja.sh create mode 100644 util/init.sls create mode 100644 util/noveriablcgen.sls diff --git a/system/files/disks_fstab.jinja b/system/files/disks_fstab.jinja index 3c861a5..ef26ad1 100644 --- a/system/files/disks_fstab.jinja +++ b/system/files/disks_fstab.jinja @@ -5,6 +5,6 @@ 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 }} /var/lib/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 diff --git a/system/init.sls b/system/init.sls index 94d162f..7cbd088 100644 --- a/system/init.sls +++ b/system/init.sls @@ -3,4 +3,5 @@ include: - .bootloader - .disks - .firewall + - .network - .user diff --git a/top.sls b/top.sls index 64ffe38..df56b1b 100644 --- a/top.sls +++ b/top.sls @@ -2,3 +2,4 @@ base: '*': - system - applications + - util diff --git a/util/files/noveriablcgen.jinja.sh b/util/files/noveriablcgen.jinja.sh new file mode 100644 index 0000000..96b4b06 --- /dev/null +++ b/util/files/noveriablcgen.jinja.sh @@ -0,0 +1 @@ +#!/bin/sh \ No newline at end of file diff --git a/util/init.sls b/util/init.sls new file mode 100644 index 0000000..36a50e5 --- /dev/null +++ b/util/init.sls @@ -0,0 +1,2 @@ +include: + - .noveriablcgen \ No newline at end of file diff --git a/util/noveriablcgen.sls b/util/noveriablcgen.sls new file mode 100644 index 0000000..e69de29