From 009511579209c92346ebe9876cae9d4a87be67d3 Mon Sep 17 00:00:00 2001 From: Donghyun Kim Date: Wed, 21 Oct 2026 03:09:47 +0900 Subject: [PATCH 1/4] Keep an empty /etc/apt/sources.list on jammy instead of removing it add-apt-repository on Ubuntu 22.04 silently writes an empty PPA .list file when /etc/apt/sources.list is missing, so PPA packages such as dotnet-sdk-9.0 (ppa:dotnet/backports) cannot be located afterwards. Co-authored-by: ParkJeongKyun <44119972+ParkJeongKyun@users.noreply.github.com> Co-authored-by: KIM EUN WOO <148983524+rlo-lo@users.noreply.github.com> Co-authored-by: Ryu_harudia <145317670+Ryu-jae-kwong@users.noreply.github.com> Co-authored-by: Donggyun Jo <90193658+Refrain4@users.noreply.github.com> --- sift/repos/ubuntu-multiverse.sls | 6 +++++- sift/repos/ubuntu-universe.sls | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sift/repos/ubuntu-multiverse.sls b/sift/repos/ubuntu-multiverse.sls index 54852828..50afea80 100644 --- a/sift/repos/ubuntu-multiverse.sls +++ b/sift/repos/ubuntu-multiverse.sls @@ -61,8 +61,12 @@ sift-security-repo: {% if codename == "jammy" %} sift-remove-sources-list-multiverse: - file.absent: + file.managed: - name: /etc/apt/sources.list + - contents: | + # Ubuntu sources have moved to /etc/apt/sources.list.d/ubuntu.sources + # This file is kept (empty) because add-apt-repository on jammy fails + # to write PPA entries when /etc/apt/sources.list does not exist. - require: - file: sift-multiverse-repo diff --git a/sift/repos/ubuntu-universe.sls b/sift/repos/ubuntu-universe.sls index eb0d90bc..856b9aec 100644 --- a/sift/repos/ubuntu-universe.sls +++ b/sift/repos/ubuntu-universe.sls @@ -39,8 +39,12 @@ sift-universe-repo: {% if codename == "jammy" %} sift-remove-sources-list: - file.absent: + file.managed: - name: /etc/apt/sources.list + - contents: | + # Ubuntu sources have moved to /etc/apt/sources.list.d/ubuntu.sources + # This file is kept (empty) because add-apt-repository on jammy fails + # to write PPA entries when /etc/apt/sources.list does not exist. - require: - file: sift-universe-repo From 6c5bc3c15381d6b97847d635c61a94c6dc29e0de Mon Sep 17 00:00:00 2001 From: Donghyun Kim Date: Wed, 21 Oct 2026 03:12:40 +0900 Subject: [PATCH 2/4] Resolve mulder working directory from the user's home The setup and ensurepath steps hardcoded /home//.local/bin, which does not exist for root (/root) or users with non-default homes. Co-authored-by: ParkJeongKyun <44119972+ParkJeongKyun@users.noreply.github.com> Co-authored-by: KIM EUN WOO <148983524+rlo-lo@users.noreply.github.com> Co-authored-by: Ryu_harudia <145317670+Ryu-jae-kwong@users.noreply.github.com> Co-authored-by: Donggyun Jo <90193658+Refrain4@users.noreply.github.com> --- sift/python3-packages/mulder.sls | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sift/python3-packages/mulder.sls b/sift/python3-packages/mulder.sls index e18ec858..57f10767 100644 --- a/sift/python3-packages/mulder.sls +++ b/sift/python3-packages/mulder.sls @@ -1,4 +1,9 @@ {%- set user = salt['pillar.get']('sift_user', 'sansforensics') -%} +{%- if user == "root" -%} + {%- set home = "/root" -%} +{%- else -%} + {%- set home = salt['user.info'](user).get('home', '/home/' ~ user) -%} +{%- endif -%} include: - sift.config.user.user @@ -28,7 +33,7 @@ sift-python3-package-mulder-setup: cmd.run: - name: mulder setup --yes - runas: {{ user }} - - cwd: /home/{{ user }}/.local/bin + - cwd: {{ home }}/.local/bin - require: - cmd: sift-python3-package-mulder @@ -36,7 +41,7 @@ sift-python3-package-mulder-ensurepath: cmd.run: - name: pipx ensurepath - runas: {{ user }} - - cwd: /home/{{ user }}/.local/bin + - cwd: {{ home }}/.local/bin - require: - cmd: sift-python3-package-mulder-setup From 5e68859dfee3371c37dfd1d7dd0c6ccacaed3b29 Mon Sep 17 00:00:00 2001 From: Donghyun Kim Date: Wed, 21 Oct 2026 03:15:14 +0900 Subject: [PATCH 3/4] Call mulder by its pipx path in the setup step pipx installs into ~/.local/bin, which is not on PATH for the salt cmd.run environment, so 'mulder setup' failed with 'not found'. Co-authored-by: ParkJeongKyun <44119972+ParkJeongKyun@users.noreply.github.com> Co-authored-by: KIM EUN WOO <148983524+rlo-lo@users.noreply.github.com> Co-authored-by: Ryu_harudia <145317670+Ryu-jae-kwong@users.noreply.github.com> Co-authored-by: Donggyun Jo <90193658+Refrain4@users.noreply.github.com> --- sift/python3-packages/mulder.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sift/python3-packages/mulder.sls b/sift/python3-packages/mulder.sls index 57f10767..9c1d8b8e 100644 --- a/sift/python3-packages/mulder.sls +++ b/sift/python3-packages/mulder.sls @@ -31,7 +31,7 @@ sift-python3-package-mulder: sift-python3-package-mulder-setup: cmd.run: - - name: mulder setup --yes + - name: {{ home }}/.local/bin/mulder setup --yes - runas: {{ user }} - cwd: {{ home }}/.local/bin - require: From ddb659bdbcfd53befe588389c11ff1cced6d7c5c Mon Sep 17 00:00:00 2001 From: Donghyun Kim Date: Wed, 21 Oct 2026 03:18:20 +0900 Subject: [PATCH 4/4] Skip mulder setup when sift_user is root mulder refuses to run 'setup' as root by design, so applying the state with sift_user=root (as CI does) always failed. Co-authored-by: ParkJeongKyun <44119972+ParkJeongKyun@users.noreply.github.com> Co-authored-by: KIM EUN WOO <148983524+rlo-lo@users.noreply.github.com> Co-authored-by: Ryu_harudia <145317670+Ryu-jae-kwong@users.noreply.github.com> Co-authored-by: Donggyun Jo <90193658+Refrain4@users.noreply.github.com> --- sift/python3-packages/mulder.sls | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sift/python3-packages/mulder.sls b/sift/python3-packages/mulder.sls index 9c1d8b8e..ec2fb47c 100644 --- a/sift/python3-packages/mulder.sls +++ b/sift/python3-packages/mulder.sls @@ -29,6 +29,8 @@ sift-python3-package-mulder: - sls: sift.packages.dotnet - user: sift-user-{{ user }} +{#- mulder refuses to run setup as root, see 'mulder setup' output #} +{%- if user != "root" %} sift-python3-package-mulder-setup: cmd.run: - name: {{ home }}/.local/bin/mulder setup --yes @@ -36,6 +38,7 @@ sift-python3-package-mulder-setup: - cwd: {{ home }}/.local/bin - require: - cmd: sift-python3-package-mulder +{%- endif %} sift-python3-package-mulder-ensurepath: cmd.run: @@ -43,5 +46,9 @@ sift-python3-package-mulder-ensurepath: - runas: {{ user }} - cwd: {{ home }}/.local/bin - require: +{%- if user != "root" %} - cmd: sift-python3-package-mulder-setup +{%- else %} + - cmd: sift-python3-package-mulder +{%- endif %}