Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions live-build/config/hooks/vm-artifacts/90-raw-disk-image.binary
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,19 @@ cat <<-EOF >"$DIRECTORY/etc/fstab"
rpool/crashdump /var/crash zfs defaults,x-systemd.before=zfs-import-cache.service,x-systemd.before=kdump-tools.service 0 0
EOF

LOGIN_DEFS_FILE="$DIRECTORY/etc/login.defs"

#
# Update UMASK value in /etc/login.defs to 027 to ensure files
# created by users have the correct permissions
#

if grep -q "^UMASK" "$LOGIN_DEFS_FILE"; then
sed -i 's/^UMASK\s\+[0-9]\+/UMASK 027/' "$LOGIN_DEFS_FILE"
else
echo "UMASK 027" >>"$LOGIN_DEFS_FILE"
fi

#
# Now we need to install the bootloader. In order to do that, we'll chroot
# into the newly populated root filesystem, so that we use the grub-install
Expand Down
13 changes: 13 additions & 0 deletions upgrade/upgrade-scripts/upgrade-container
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,19 @@ function create_upgrade_container() {
rpool/crashdump /var/crash zfs defaults,x-systemd.before=zfs-import-cache.service,x-systemd.before=kdump-tools.service 0 0
EOF

LOGIN_DEFS_FILE="$DIRECTORY/etc/login.defs"

#
# Update UMASK value in /etc/login.defs to 027 to ensure files
# created by users have the correct permissions
#

if grep -q "^UMASK" "$LOGIN_DEFS_FILE"; then
sed -i 's/^UMASK\s\+[0-9]\+/UMASK 027/' "$LOGIN_DEFS_FILE"
else
echo "UMASK 027" >>"$LOGIN_DEFS_FILE"
fi

#
# DLPX-75089 - Since older versions of Delphix did not properly
# disable the NFS services within the upgrade container, we have
Expand Down