Skip to content

Commit 64f414a

Browse files
committed
test changes duplicate with execStart
PR URL: https://www.github.com/delphix/delphix-platform/pull/525
1 parent 7fcc2e7 commit 64f414a

File tree

3 files changed

+63
-4
lines changed

3 files changed

+63
-4
lines changed

debian/preinst

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#!/bin/bash -eux
2+
#
3+
# Copyright 2025 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+
# 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.
27+
fs_tab=/etc/fstab
28+
29+
if grep -q "\/export\/home" "$fs_tab"; then
30+
sed -i 's|/export/home|/home|g' "$fs_tab"
31+
mount /home
32+
fi
33+
34+
passwd_file=/etc/passwd
35+
if grep -q "\/export\/home" "$passwd_file"; then
36+
sed -i 's/\/export\/home/\/home/g' /etc/passwd
37+
fi
38+
39+
;;
40+
esac
41+
42+
exit 0

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

+17
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,23 @@ Before=rsync.service docker.service
2424
Type=oneshot
2525
ExecStart=/var/lib/delphix-platform/ansible/apply
2626
ExecStart=/var/lib/delphix-platform/dynamic-debug
27+
ExecStart=/bin/sh -c '\
28+
echo "Ensuring /export/home is a symlink to /home..."; \
29+
if mountpoint -q /export/home; then \
30+
echo "/export/home is a mountpoint, unmounting..."; \
31+
umount /export/home || { echo "Failed to unmount /export/home"; exit 1; }; \
32+
fi; \
33+
if [ -e /export/home ] && [ ! -L /export/home ]; then \
34+
echo "Removing existing /export/home directory..."; \
35+
rm -rf /export/home; \
36+
fi; \
37+
if [ ! -d /export ]; then \
38+
mkdir /export; \
39+
fi; \
40+
if [ -d /export ] && [ ! -L /export/home ]; then \
41+
echo "Creating symlink: /export/home -> /home"; \
42+
ln -s /home /export/home; \
43+
fi;'
2744
RemainAfterExit=yes
2845

2946
#

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2018, 2023 Delphix
2+
# Copyright 2018, 2025 Delphix
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -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

0 commit comments

Comments
 (0)