Skip to content

Commit b5743b5

Browse files
committed
DLPX-89763 DLPX-86523 delphix-platform changes
PR URL: https://www.github.com/delphix/delphix-platform/pull/477
1 parent 8aa7466 commit b5743b5

File tree

2 files changed

+85
-3
lines changed
  • debian
  • files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks

2 files changed

+85
-3
lines changed

debian/preinst

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#!/bin/bash -eux
2+
#
3+
# Copyright 2024 Delphix
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
case $1 in
19+
upgrade)
20+
# Checking the fstab file if the /export/home entry
21+
# is present in the /etc/fstab, In case of container
22+
# upgrade the file is already changed by the
23+
# container-upgrade script and we dont need to do
24+
# it again.
25+
fs_tab=/etc/fstab
26+
auto_master=/etc/auto.master
27+
28+
if grep -q "\/export\/home" "$fs_tab"; then
29+
sed -i 's|/export/home|/home|g' "$fs_tab"
30+
mount /home
31+
fi
32+
33+
if [[ -e $auto_master ]]; then
34+
if grep -q "\/home\s+auto_home\s+-nobrowse" "$auto_master"; then
35+
sed -i 's|/home auto_home -nobrowse|#/home auto_home -nobrowse|g' "$auto_master"
36+
systemctl restart autofs
37+
fi
38+
fi
39+
40+
passwd_file=/etc/passwd
41+
if grep -q "\/export\/home" "$passwd_file"; then
42+
sed -i 's/\/export\/home/\/home/g' /etc/passwd
43+
fi
44+
45+
;;
46+
esac
47+
48+
exit 0

files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml

+37-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# it below; otherwise that task will fail.
2323
#
2424
- file:
25-
path: /export/home
25+
path: /home
2626
state: directory
2727
mode: 0755
2828

@@ -35,7 +35,7 @@
3535
shell: /bin/bash
3636
create_home: yes
3737
comment: Delphix User
38-
home: /export/home/delphix
38+
home: /home/delphix
3939

4040
#
4141
# In order for this locale to be used (e.g. by virtualization) we need
@@ -689,7 +689,7 @@
689689
690690
- name: Source bash completion
691691
blockinfile:
692-
dest: "/export/home/delphix/.bashrc"
692+
dest: "/home/delphix/.bashrc"
693693
block: |
694694
. /etc/bash_completion.d/systemctl
695695
. /etc/bash_completion.d/zfs
@@ -738,3 +738,37 @@
738738
path: /etc/environment
739739
state: absent
740740
regexp: '^\s*PATH\s*='
741+
742+
#
743+
# Soft link creation in case it doesn't exist
744+
#
745+
746+
- name: Check export
747+
ansible.builtin.stat:
748+
path: /export
749+
register: export_status
750+
751+
- name: Check export home
752+
ansible.builtin.stat:
753+
path: /export/home
754+
when: export_status.stat.exists and export_status.stat.isdir
755+
register: export_home_status
756+
757+
- name: Delete home directory
758+
ansible.builtin.file:
759+
path: /export/home
760+
state: absent
761+
when: export_home_status.stat.exists and export_home_status.stat.isdir
762+
763+
- name: Create export directory
764+
ansible.builtin.file:
765+
path: /export
766+
state: directory
767+
mode: 0755
768+
when: not export_status.stat.exists
769+
770+
- name: Create the soft link
771+
ansible.builtin.file:
772+
src: /home
773+
dest: /export/home
774+
state: link

0 commit comments

Comments
 (0)