Skip to content

Commit d80aafb

Browse files
committed
Changing as per Seb-s comment to alter the softlink logic.
1 parent 43d194d commit d80aafb

File tree

3 files changed

+11
-55
lines changed

3 files changed

+11
-55
lines changed

debian/preinst

+7-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717

1818
case $1 in
1919
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.
20+
# Home directories were previously mounted under /export/home,
21+
# and this was changed to /home. This is the upgrade logic that
22+
# updates the /etc/fstab file to reflect that change.
23+
# Home directories will be mounted in both /export/home and /home
24+
# until the system is rebooted to ensure that running processes
25+
# referencing the old /export/home paths continue to function
26+
# while also enabling new logins under /home to work.
2527
fs_tab=/etc/fstab
2628
auto_master=/etc/auto.master
2729

files/common/lib/systemd/system/delphix-platform.service

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ Before=rsync.service docker.service
2222

2323
[Service]
2424
Type=oneshot
25+
26+
# Create /export/home symlink to /home if it doesn't already exist
27+
ExecStartPre=/bin/sh -c '[ -L /export/home ] || ln -s /home /export/home'
28+
2529
ExecStart=/var/lib/delphix-platform/ansible/apply
2630
ExecStart=/var/lib/delphix-platform/dynamic-debug
2731
RemainAfterExit=yes

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

-50
Original file line numberDiff line numberDiff line change
@@ -738,53 +738,3 @@
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-
- name: Check export
746-
ansible.builtin.stat:
747-
path: /export
748-
register: export_status
749-
750-
- name: Check export home
751-
ansible.builtin.stat:
752-
path: /export/home
753-
when: export_status.stat.exists and export_status.stat.isdir
754-
register: export_home_status
755-
756-
#
757-
# Before deleting the /export/home directory if the
758-
# home data set is mounted on /export/home if its
759-
# mounted remove if first and then go ahead.
760-
#
761-
- name: Check if the path is mounted
762-
ansible.builtin.shell: |
763-
mount | grep /export/home
764-
register: mount_status
765-
ignore_errors: yes
766-
767-
- name: Unmount the path if it is mounted
768-
ansible.builtin.mount:
769-
path: /export/home
770-
state: unmounted
771-
when: mount_status.rc == 0
772-
773-
- name: Delete home directory
774-
ansible.builtin.file:
775-
path: /export/home
776-
state: absent
777-
when: not export_status.stat.exists or export_home_status.stat.exists and export_home_status.stat.isdir
778-
779-
- name: Create export directory
780-
ansible.builtin.file:
781-
path: /export
782-
state: directory
783-
mode: 0755
784-
when: not export_status.stat.exists
785-
786-
- name: Create the soft link
787-
ansible.builtin.file:
788-
src: /home
789-
dest: /export/home
790-
state: link

0 commit comments

Comments
 (0)