Skip to content

Commit 169d477

Browse files
committed
Incorporating nosuid changes
1 parent 60d749a commit 169d477

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

live-build/config/hooks/vm-artifacts/90-raw-disk-image.binary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ rsync --info=stats3 -WaAX binary/* "$DIRECTORY/"
312312
# automatically whenever we boot into the crash kernel.
313313
#
314314
cat <<-EOF >"$DIRECTORY/etc/fstab"
315-
rpool/ROOT/$FSNAME/home /home zfs defaults,nodev,x-systemd.before=zfs-import-cache.service 0 0
315+
rpool/ROOT/$FSNAME/home /home zfs defaults,nodev,nosuid,x-systemd.before=zfs-import-cache.service 0 0
316316
rpool/ROOT/$FSNAME/data /var/delphix zfs defaults,x-systemd.before=zfs-import-cache.service 0 0
317317
rpool/ROOT/$FSNAME/log /var/log zfs defaults,x-systemd.before=zfs-import-cache.service 0 0
318318
rpool/ROOT/$FSNAME/tmp /tmp zfs defaults,nosuid,nodev,exec,x-systemd.before=zfs-import-cache.service 0 0

upgrade/upgrade-scripts/upgrade-container

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ function create_upgrade_container() {
213213
# before the zfs-import service is run.
214214
#
215215
cat <<-EOF >"$DIRECTORY/etc/fstab"
216-
rpool/ROOT/$CONTAINER/home /home zfs defaults,nodev,x-systemd.before=zfs-import-cache.service 0 0
216+
rpool/ROOT/$CONTAINER/home /home zfs defaults,nodev,nosuid,x-systemd.before=zfs-import-cache.service 0 0
217217
rpool/ROOT/$CONTAINER/data /var/delphix zfs defaults,x-systemd.before=zfs-import-cache.service 0 0
218218
rpool/ROOT/$CONTAINER/log /var/log zfs defaults,x-systemd.before=zfs-import-cache.service 0 0
219219
rpool/crashdump /var/crash zfs defaults,x-systemd.before=zfs-import-cache.service,x-systemd.before=kdump-tools.service 0 0

0 commit comments

Comments
 (0)