Skip to content

DLPX-86523 CIS: /home filesystem and mount options #756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

DLPX-86523 CIS: /home filesystem and mount options #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4728fce
DLPX-86523 CIS: /home filesystem and mount options
justsanjeev May 20, 2025
8be6a49
Incorporating nosuid changes
justsanjeev Jul 13, 2025
e972b9e
This code was creating cache inside /export/home/delphx/.cache/pip/ht…
justsanjeev Jul 23, 2025
6a82481
This code was creating cache inside /export/home/delphx/.cache/pip/ht…
justsanjeev Jul 23, 2025
27d264e
This code was creating cache inside /export/home/delphx/.cache/pip/ht…
justsanjeev Jul 24, 2025
5840934
Removing,'Clean up pip cache directory', since the 'Install awscli py…
justsanjeev Jul 24, 2025
3a48d5d
Removing the change for deleting cache related to awscli instllation …
justsanjeev Sep 1, 2025
5d365f5
adding the no-cache for pip installation
justsanjeev Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions bootstrap/roles/appliance-build.bootstrap/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@
ansible.builtin.pip:
name: awscli
break_system_packages: true
extra_args: "--no-cache-dir"
environment:
PIP_NO_CACHE_DIR: "yes"
Comment on lines +90 to +92
Copy link
Contributor

@sebroy sebroy Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this one is unnecessary, as the bootstrap ansible role doesn't run in the chroot. It's only run on the build server before the build starts.

become: true

- name: Load ZFS kernel module.
Expand Down
10 changes: 5 additions & 5 deletions live-build/config/hooks/vm-artifacts/90-raw-disk-image.binary
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -ex
#
# Copyright 2018 Delphix
# Copyright 2018, 2025 Delphix
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -274,8 +274,8 @@ zfs create \
# contents. During normal boot up, we'll rely on "/etc/fstab" to handle
# these mounts.
#
mkdir -p "$DIRECTORY/export/home"
mount -t zfs "$FSNAME/ROOT/$FSNAME/home" "$DIRECTORY/export/home"
mkdir -p "$DIRECTORY/home"
mount -t zfs "$FSNAME/ROOT/$FSNAME/home" "$DIRECTORY/home"

mkdir -p "$DIRECTORY/var/delphix"
mount -t zfs "$FSNAME/ROOT/$FSNAME/data" "$DIRECTORY/var/delphix"
Expand Down Expand Up @@ -314,7 +314,7 @@ rsync --info=stats3 -WaAX binary/* "$DIRECTORY/"
# automatically whenever we boot into the crash kernel.
#
cat <<-EOF >"$DIRECTORY/etc/fstab"
rpool/ROOT/$FSNAME/home /export/home zfs defaults,x-systemd.before=zfs-import-cache.service 0 0
rpool/ROOT/$FSNAME/home /home zfs defaults,nodev,nosuid,x-systemd.before=zfs-import-cache.service 0 0
rpool/ROOT/$FSNAME/data /var/delphix zfs defaults,x-systemd.before=zfs-import-cache.service 0 0
rpool/ROOT/$FSNAME/log /var/log zfs defaults,x-systemd.before=zfs-import-cache.service 0 0
rpool/ROOT/$FSNAME/tmp /tmp zfs defaults,nosuid,nodev,exec,x-systemd.before=zfs-import-cache.service 0 0
Expand Down Expand Up @@ -420,7 +420,7 @@ done

umount "$DIRECTORY/var/log"
umount "$DIRECTORY/var/delphix"
umount "$DIRECTORY/export/home"
umount "$DIRECTORY/home"
umount "$DIRECTORY/tmp"
umount "$DIRECTORY/var/tmp"
umount "/var/crash"
Expand Down
6 changes: 3 additions & 3 deletions live-build/misc/ansible-roles/appliance-build.masking-development/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2018 Delphix
# Copyright 2018, 2025 Delphix
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -26,14 +26,14 @@
- git:
repo: "https://{{ lookup('env', 'GITHUB_TOKEN') }}@github.com/delphix/dms-core-gate.git"
dest:
"/export/home/delphix/dms-core-gate"
"/home/delphix/dms-core-gate"
version: "develop"
accept_hostkey: yes
update: no
when: lookup('env', 'GITHUB_TOKEN') != ''

- file:
path: "/export/home/delphix/{{ item }}"
path: "/home/delphix/{{ item }}"
owner: delphix
group: staff
mode: "g+w"
Expand Down
6 changes: 3 additions & 3 deletions live-build/misc/ansible-roles/appliance-build.minimal-common/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2018 Delphix
# Copyright 2018, 2025 Delphix
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -26,7 +26,7 @@
no_log: true

- file:
path: /export/home
path: /home
state: directory
mode: 0755

Expand All @@ -39,7 +39,7 @@
shell: /bin/bash
create_home: yes
comment: Delphix User
home: /export/home/delphix
home: /home/delphix
password:
"{{ lookup('env', 'APPLIANCE_PASSWORD') | password_hash('sha512') }}"

Expand Down
3 changes: 3 additions & 0 deletions live-build/misc/ansible-roles/appliance-build.minimal-internal/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
ansible.builtin.pip:
name: awscli
break_system_packages: true
extra_args: "--no-cache-dir"
environment:
PIP_NO_CACHE_DIR: "yes"
Comment on lines +37 to +39
Copy link
Contributor

@sebroy sebroy Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add a comment here explaining why pip caching is bad at this stage of the build (because whatever files pip caches will end up in our production images, and we don't want that).

become: true

# Add /usr/local/bin to the PATH (awscli needs it)
Expand Down
4 changes: 2 additions & 2 deletions live-build/misc/ansible-roles/appliance-build.unittest-internal/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2019 Delphix
# Copyright 2019, 2025 Delphix
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -95,7 +95,7 @@
- user:
name: testrunner
comment: "Delphix"
home: /export/home/testrunner
home: /home/testrunner
groups: docker
password:
"$6$pWQE0MPZWgue7fNC$8RvR0u04Mt67792b.x4ao0G2Z/H/hrYPWezOqCkz59MIA\
Expand Down
6 changes: 3 additions & 3 deletions live-build/misc/ansible-roles/appliance-build.virtualization-development/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2018 Delphix
# Copyright 2018, 2025 Delphix
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -73,14 +73,14 @@

- git:
repo: "https://{{ lookup('env', 'GITHUB_TOKEN') }}@github.com/delphix/dlpx-app-gate.git"
dest: "/export/home/delphix/dlpx-app-gate"
dest: "/home/delphix/dlpx-app-gate"
version: "develop"
accept_hostkey: yes
update: no
when: lookup('env', 'GITHUB_TOKEN') != ''

- file:
path: "/export/home/delphix/{{ item }}"
path: "/home/delphix/{{ item }}"
owner: delphix
group: staff
mode: "g+w"
Expand Down
10 changes: 5 additions & 5 deletions live-build/misc/ansible-roles/appliance-build.zfsonlinux-development/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2018 Delphix
# Copyright 2018, 2025 Delphix
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -67,26 +67,26 @@
- git:
repo: "https://{{ lookup('env', 'GITHUB_TOKEN') }}@github.com/delphix/zfs.git"
dest:
"/export/home/delphix/zfs"
"/home/delphix/zfs"
version: develop
accept_hostkey: yes
update: no
when: lookup('env', 'GITHUB_TOKEN') != ''

- file:
path: "/export/home/delphix/zfs"
path: "/home/delphix/zfs"
owner: delphix
group: staff
state: directory
recurse: yes

- file:
path: "/export/home/delphix/.cargo/"
path: "/home/delphix/.cargo/"
state: directory
owner: delphix
group: staff
- copy:
dest: "/export/home/delphix/.cargo/config.toml"
dest: "/home/delphix/.cargo/config.toml"
content: |
[target.x86_64-unknown-linux-gnu]
rustflags = ["-C", "link-arg=-B/usr/libexec/mold"]
2 changes: 1 addition & 1 deletion upgrade/FAQ.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ resemble the following:

A "rootfs container" is a collection of ZFS datasets that can be used as
the "root filesytsem" of the appliance. This includes a dataset for "/"
of the appliance, but also seperate datasets for "/export/home" and
of the appliance, but also seperate datasets for "/home" and
"/var/delphix".

Here's an example of the datasets for a rootfs container:
Expand Down
4 changes: 2 additions & 2 deletions upgrade/upgrade-scripts/upgrade-container
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ function create_upgrade_container() {
-o mountpoint=legacy \
"$ROOTFS_DATASET/home@$SNAPSHOT_NAME" \
"rpool/ROOT/$CONTAINER/home" ||
die "failed to create upgrade /export/home clone"
die "failed to create upgrade /home clone"

zfs clone \
-o mountpoint=legacy \
Expand Down Expand Up @@ -213,7 +213,7 @@ function create_upgrade_container() {
# before the zfs-import service is run.
#
cat <<-EOF >"$DIRECTORY/etc/fstab"
rpool/ROOT/$CONTAINER/home /export/home zfs defaults,x-systemd.before=zfs-import-cache.service 0 0
rpool/ROOT/$CONTAINER/home /home zfs defaults,nodev,nosuid,x-systemd.before=zfs-import-cache.service 0 0
rpool/ROOT/$CONTAINER/data /var/delphix zfs defaults,x-systemd.before=zfs-import-cache.service 0 0
rpool/ROOT/$CONTAINER/log /var/log zfs defaults,x-systemd.before=zfs-import-cache.service 0 0
rpool/crashdump /var/crash zfs defaults,x-systemd.before=zfs-import-cache.service,x-systemd.before=kdump-tools.service 0 0
Expand Down
Loading