From 0c718f30598a98086447e15dcbed6757ade24d02 Mon Sep 17 00:00:00 2001 From: Sanjeev Rohila Date: Thu, 11 Jul 2024 15:32:45 +0530 Subject: [PATCH] DLPX-89763 DLPX-86523 delphix-platform changes PR URL: https://www.github.com/delphix/delphix-platform/pull/477 --- debian/preinst | 61 +++++++++++++++++++ .../roles/delphix-platform/tasks/main.yml | 6 +- 2 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 debian/preinst diff --git a/debian/preinst b/debian/preinst new file mode 100644 index 00000000..f2400eb1 --- /dev/null +++ b/debian/preinst @@ -0,0 +1,61 @@ +#!/bin/bash -eux +# +# Copyright 2024 Delphix +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +case $1 in +upgrade) + # Checking the fstab file if the /export/home entry + # is present in the /etc/fstab, In case of container + # upgrade the file is already changed by the + # container-upgrade script and we dont need to do + # it again. + fs_tab=/etc/fstab + auto_master=/etc/auto.master + + if grep -q "\/export\/home" "$fs_tab" + then + sed -i 's|/export/home|/home|g' "$fs_tab" + mount /home + fi + + if [[ -e $auto_master ]] + then + if grep -q "\/home\s+auto_home\s+-nobrowse" "$auto_master" + then + sed -i 's|/home auto_home -nobrowse|#/home auto_home -nobrowse|g' "$auto_master" + systemctl restart autofs + fi + fi + + passwd_file=/etc/passwd + if grep -q "\/export\/home\/delphix" "$passwd_file" + then + sed -i 's/\/export\/home\/delphix/\/home\/delphix/g' /etc/passwd + fi + + if grep -q "\/export\/home\/cli" "$passwd_file" + then + sed -i 's/\/export\/home\/cli/\/home\/cli/g' /etc/passwd + fi + + if grep -q "\/export\/home\/cloudagent" "$passwd_file" + then + sed -i 's/\/export\/home\/cloudagent/\/home\/cloudagent/g' /etc/passwd + fi + + ;; +esac +exit 0 diff --git a/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml b/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml index 36f1956a..89370851 100644 --- a/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml +++ b/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml @@ -22,7 +22,7 @@ # it below; otherwise that task will fail. # - file: - path: /export/home + path: /home state: directory mode: 0755 @@ -35,7 +35,7 @@ shell: /bin/bash create_home: yes comment: Delphix User - home: /export/home/delphix + home: /home/delphix # # In order for this locale to be used (e.g. by virtualization) we need @@ -689,7 +689,7 @@ - name: Source bash completion blockinfile: - dest: "/export/home/delphix/.bashrc" + dest: "/home/delphix/.bashrc" block: | . /etc/bash_completion.d/systemctl . /etc/bash_completion.d/zfs